Merge pull request cocos2d#149 from toriumi0118/dev

Enable to [cocos run -p android] for Android Studio by mac.

Author: Bin Zhang

.gitignore

@@ -51,3 +51,6 @@ plugins/project_compile/build_web/bin
 plugins/plugin_jscompile/bin
 version.json
 v*-console-*.zip
+
+# vim
+*~

bin/cocos.py

@@ -99,6 +99,39 @@ def output_for(command, verbose):
 
             raise CCPluginError(message)
 
+    @staticmethod
+    def convert_path_to_cmd(path):
+        """ Convert path which include space to correct style which bash(mac) and cmd(windows) can treat correctly.
+        
+            eg: on mac: convert '/usr/xxx/apache-ant 1.9.3' to '/usr/xxx/apache-ant\ 1.9.3'
+            eg: on windows: convert '"c:\apache-ant 1.9.3"\bin' to '"c:\apache-ant 1.9.3\bin"'
+        """
+        ret = path
+        if os_is_mac():
+            ret = path.replace("\ ", " ").replace(" ", "\ ")
+
+        if os_is_win32():
+            ret = "\"%s\"" % (path.replace("\"", ""))
+
+        # print("!!!!! Convert %s to %s\n" % (path, ret))
+        return ret
+   
+    @staticmethod
+    def convert_path_to_python(path):
+        """ COnvert path which include space to correct style which python can treat correctly.
+
+            eg: on mac: convert '/usr/xxx/apache-ant\ 1.9.3' to '/usr/xxx/apache-ant 1.9.3'
+            eg: on windows: convert '"c:\apache-ant 1.9.3"\bin' to 'c:\apache-ant 1.9.3\bin'
+        """
+        ret = path
+        if os_is_mac():
+            ret = path.replace("\ ", " ")
+
+        if os_is_win32():
+            ret = ret.replace("\"", "")
+
+        # print("!!!!! Convert %s to %s\n" % (path, ret))
+        return ret
 
 #
 # Plugins should be a sublass of CCPlugin
@@ -257,7 +290,7 @@ def select_default_android_platform(min_api_level):
     sdk_root = check_environment_variable('ANDROID_SDK_ROOT')
     platforms_dir = os.path.join(sdk_root, "platforms")
     if os.path.isdir(platforms_dir):
-       for num in range (min_api_level, 19+1):
+       for num in range (min_api_level, 21):
            android_platform = 'android-%s' % num
            if os.path.isdir(os.path.join(platforms_dir, android_platform)):
                Logging.info('%s is found' % android_platform)

plugins/project_compile/build_android.py

@@ -39,37 +39,6 @@ def __init__(self, verbose, cocos_root, app_android_root, no_res, proj_obj):
     def _run_cmd(self, command):
         cocos.CMDRunner.run_cmd(command, self._verbose)
 
-    def _convert_path_to_cmd(self, path):
-        """ Convert path which include space to correct style which bash(mac) and cmd(windows) can treat correctly.
-        
-            eg: on mac: convert '/usr/xxx/apache-ant 1.9.3' to '/usr/xxx/apache-ant\ 1.9.3'
-            eg: on windows: convert '"c:\apache-ant 1.9.3"\bin' to '"c:\apache-ant 1.9.3\bin"'
-        """
-        ret = path
-        if cocos.os_is_mac():
-            ret = path.replace("\ ", " ").replace(" ", "\ ")
-
-        if cocos.os_is_win32():
-            ret = "\"%s\"" % (path.replace("\"", ""))
-
-        # print("!!!!! Convert %s to %s\n" % (path, ret))
-        return ret
-   
-    def _convert_path_to_python(self, path):
-        """ COnvert path which include space to correct style which python can treat correctly.
-
-            eg: on mac: convert '/usr/xxx/apache-ant\ 1.9.3' to '/usr/xxx/apache-ant 1.9.3'
-            eg: on windows: convert '"c:\apache-ant 1.9.3"\bin' to 'c:\apache-ant 1.9.3\bin'
-        """
-        ret = path
-        if cocos.os_is_mac():
-            ret = path.replace("\ ", " ")
-
-        if cocos.os_is_win32():
-            ret = ret.replace("\"", "")
-
-        # print("!!!!! Convert %s to %s\n" % (path, ret))
-        return ret
 
     def _parse_cfg(self):
         self.cfg_path = os.path.join(self.app_android_root, BUILD_CFIG_FILE)
@@ -220,7 +189,7 @@ def update_lib_projects(self, sdk_root, sdk_tool_path, android_platform):
                 if os.path.isdir(abs_lib_path):
                     api_level = self.check_android_platform(sdk_root, android_platform, abs_lib_path, True)
                     str_api_level = "android-" + str(api_level)
-                    command = "%s update lib-project -p %s -t %s" % (self._convert_path_to_cmd(sdk_tool_path), abs_lib_path, str_api_level)
+                    command = "%s update lib-project -p %s -t %s" % (cocos.CMDRunner.convert_path_to_cmd(sdk_tool_path), abs_lib_path, str_api_level)
                     self._run_cmd(command)
 
     def get_target_config(self, proj_path):
@@ -263,7 +232,7 @@ def check_android_platform(self, sdk_root, android_platform, proj_path, auto_sel
             raise cocos.CCPluginError("Can't find right android-platform for project : \"%s\". The android-platform should be equal/larger than %d" % (proj_path, min_platform))
 
         platform_path = "android-%d" % ret
-        ret_path = os.path.join(self._convert_path_to_python(sdk_root), "platforms", platform_path)
+        ret_path = os.path.join(cocos.CMDRunner.convert_path_to_python(sdk_root), "platforms", platform_path)
         if not os.path.isdir(ret_path):
             raise cocos.CCPluginError("The directory \"%s\" can't be found in android SDK" % platform_path)
 
@@ -280,7 +249,7 @@ def do_build_apk(self, sdk_root, ant_root, android_platform, build_mode, output_
 
         # update project
         str_api_level = "android-" + str(api_level)
-        command = "%s update project -t %s -p %s" % (self._convert_path_to_cmd(sdk_tool_path), str_api_level, app_android_root)
+        command = "%s update project -t %s -p %s" % (cocos.CMDRunner.convert_path_to_cmd(sdk_tool_path), str_api_level, app_android_root)
         self._run_cmd(command)
 
         # update lib-projects
@@ -304,7 +273,7 @@ def do_build_apk(self, sdk_root, ant_root, android_platform, build_mode, output_
         # invoke custom step: pre-ant-build
         self._project.invoke_custom_step_script(cocos_project.Project.CUSTOM_STEP_PRE_ANT_BUILD, target_platform, args_ant_copy)
 
-        command = "%s clean %s -f %s -Dsdk.dir=%s" % (self._convert_path_to_cmd(ant_path), build_mode, buildfile_path, self._convert_path_to_cmd(sdk_root))
+        command = "%s clean %s -f %s -Dsdk.dir=%s" % (cocos.CMDRunner.convert_path_to_cmd(ant_path), build_mode, buildfile_path, cocos.CMDRunner.convert_path_to_cmd(sdk_root))
         self._run_cmd(command)
 
         # invoke custom step: post-ant-build
@@ -401,7 +370,7 @@ def _sign_release_apk(self, unsigned_path, signed_path):
 
     def _zipalign_apk(self, apk_file, aligned_file, sdk_root):
         align_path = os.path.join(sdk_root, "tools", "zipalign")
-        align_cmd = "%s 4 %s %s" % (self._convert_path_to_cmd(align_path), apk_file, aligned_file)
+        align_cmd = "%s 4 %s %s" % (cocos.CMDRunner.convert_path_to_cmd(align_path), apk_file, aligned_file)
         if os.path.exists(aligned_file):
             os.remove(aligned_file)
         self._run_cmd(align_cmd)

plugins/project_deploy.py

@@ -116,7 +116,7 @@ def deploy_android(self, dependencies):
         compile_dep = dependencies['compile']
         apk_path = compile_dep.apk_path
         sdk_root = cocos.check_environment_variable('ANDROID_SDK_ROOT')
-        adb_path = os.path.join(sdk_root, 'platform-tools', 'adb')
+        adb_path = cocos.CMDRunner.convert_path_to_cmd(os.path.join(sdk_root, 'platform-tools', 'adb'))
 
         #TODO detect if the application is installed before running this
         adb_uninstall = "%s uninstall %s" % (adb_path, self.package)

plugins/project_run/project_run.py

@@ -80,7 +80,7 @@ def run_android_device(self, dependencies):
             return
 
         sdk_root = cocos.check_environment_variable('ANDROID_SDK_ROOT')
-        adb_path = os.path.join(sdk_root, 'platform-tools', 'adb')
+        adb_path = cocos.CMDRunner.convert_path_to_cmd(os.path.join(sdk_root, 'platform-tools', 'adb'))
         deploy_dep = dependencies['deploy']
         startapp = "%s shell am start -n \"%s/%s\"" % (adb_path, deploy_dep.package, deploy_dep.activity)
         self._run_cmd(startapp)