Merge pull request cocos2d#169 from natural-law/develop

Modify the compile command to be compatible with the projects created by Cocos.

Author: minggo

plugins/project_compile/build_android.py

@@ -153,7 +153,13 @@ def do_ndk_build(self, ndk_build_param, build_mode):
         reload(sys)
         sys.setdefaultencoding('utf8')
         ndk_path = os.path.join(ndk_root, "ndk-build")
-        module_paths = [os.path.join(app_android_root, path) for path in self.ndk_module_paths]
+
+        module_paths = []
+        for cfg_path in self.ndk_module_paths:
+            if cfg_path.find("${ENGINE_ROOT}") >= 0:
+                module_paths.append(cfg_path.replace("${ENGINE_ROOT}", cocos_root))
+            else:
+                module_paths.append(os.path.join(app_android_root, cfg_path))
 
         # delete template static and dynamic files
         obj_local_dir = os.path.join(self.app_android_root, "obj", "local")

plugins/project_compile/project_compile.py

@@ -351,6 +351,7 @@ def build_android(self):
             return
 
         project_dir = self._project.get_project_dir()
+        project_android_dir = self._platforms.project_path()
         build_mode = self._mode
         output_dir = self._output_dir
         if self._project._is_script_project():
@@ -361,10 +362,26 @@ def build_android(self):
         else:
             cocos_root = os.path.join(project_dir, 'cocos2d')
 
+        if not os.path.exists(cocos_root):
+            # get the cocos root from environment variable
+            if self._project._is_script_project():
+                if self._project._is_lua_project():
+                    var_name = "COCOS_X_ROOT"
+                else:
+                    var_name = "COCOS_JS_ROOT"
+            else:
+                var_name = "COCOS_X_ROOT"
+
+            cocos_root = cocos.check_environment_variable(var_name)
+            if self._project._is_js_project():
+                cocos_root = os.path.join(cocos_root, "frameworks", "js-bindings", "cocos2d-x")
+
+            if not os.path.exists(cocos_root):
+                raise cocos.CCPluginError("Can't find the engine in path : %s" % cocos_root)
+
         # check environment variable
         ant_root = cocos.check_environment_variable('ANT_ROOT')
         sdk_root = cocos.check_environment_variable('ANDROID_SDK_ROOT')
-        project_android_dir = self._platforms.project_path()
 
         from build_android import AndroidBuilder
         builder = AndroidBuilder(self._verbose, cocos_root, project_android_dir, self._no_res, self._project)