Merge pull request #390 from natural-law/add-no-uninstall

Add option '--no-uninstall' for cocos deploy.

Author: Bin Zhang

bin/cocos.py

@@ -30,7 +30,7 @@
 # FIXME: MultiLanguage should be deprecated in favor of gettext
 from MultiLanguage import MultiLanguage
 
-COCOS2D_CONSOLE_VERSION = '2.1'
+COCOS2D_CONSOLE_VERSION = '2.2'
 
 
 class Cocos2dIniParser:

bin/strings.json

@@ -42,6 +42,7 @@
         "PROJECT_WARNING_CUSTOM_STEP_FAILED_FMT" : "Custom step invoke failed: %s",
         "DEPLOY_BRIEF" : "Compile and deploy a project to a device/simulator.",
         "DEPLOY_ARG_MODE" : "Set the deploy mode, should be debug|release, default is debug.",
+        "DEPLOY_ARG_NO_UNINSTALL" : "Set to no uninstall the app before deploy.",
         "DEPLOY_ERROR_XAPCMD_NOT_FOUND" : "XapDeployCmd.exe not found, can't deploy the application.",
         "DEPLOY_INFO_FIND_XAP_FMT" : "Find xap deployment tools in registry : %s",
         "DEPLOY_INFO_INSTALLING_APK" : "Installing on device",
@@ -382,6 +383,7 @@
         "PROJECT_WARNING_CUSTOM_STEP_FAILED_FMT" : "调用自定义步骤失败：%s",
         "DEPLOY_BRIEF" : "编译并在设备或模拟器上部署工程。",
         "DEPLOY_ARG_MODE" : "设置部署模式，可选值为 debug/release，默认值为 debug。",
+        "DEPLOY_ARG_NO_UNINSTALL" : "安装应用之前不卸载之前安装的应用。",
         "DEPLOY_ERROR_XAPCMD_NOT_FOUND" : "找不到 XapDeployCmd.exe，无法安装应用。",
         "DEPLOY_INFO_FIND_XAP_FMT" : "在 %s 注册表中查找 xap 部署工具。",
         "DEPLOY_INFO_INSTALLING_APK" : "正在安装应用程序。",
@@ -721,6 +723,7 @@
         "PROJECT_WARNING_CUSTOM_STEP_FAILED_FMT" : "調用自定義步驟失敗：%s",
         "DEPLOY_BRIEF" : "編譯並在設備或模擬器上部署工程。",
         "DEPLOY_ARG_MODE" : "設置部署模式，可選值為 debug/release，默認值為 debug。",
+        "DEPLOY_ARG_NO_UNINSTALL" : "安裝應用之前不卸載之前安裝的應用。",
         "DEPLOY_ERROR_XAPCMD_NOT_FOUND" : "找不到 XapDeployCmd.exe，無法安裝應用。",
         "DEPLOY_INFO_FIND_XAP_FMT" : "在 %s 註冊表中查找 xap 部署工具。",
         "DEPLOY_INFO_INSTALLING_APK" : "正在安裝應用程式。",

plugins/plugin_deploy.py

@@ -37,6 +37,8 @@ def brief_description():
     def _add_custom_options(self, parser):
         parser.add_argument("-m", "--mode", dest="mode", default='debug',
                           help=MultiLanguage.get_string('DEPLOY_ARG_MODE'))
+        parser.add_argument("--no-uninstall", dest="no_uninstall", action="store_true",
+                          help=MultiLanguage.get_string('DEPLOY_ARG_NO_UNINSTALL'))
 
     def _check_custom_options(self, args):
 
@@ -47,6 +49,8 @@ def _check_custom_options(self, args):
         if 'release' == args.mode:
             self._mode = args.mode
 
+        self._no_uninstall = args.no_uninstall
+
     def _is_debug_mode(self):
         return self._mode == 'debug'
 
@@ -151,12 +155,13 @@ def deploy_wp8(self, dependencies):
             raise cocos.CCPluginError(MultiLanguage.get_string('DEPLOY_ERROR_XAPCMD_NOT_FOUND'),
                                       cocos.CCPluginError.ERROR_TOOLS_NOT_FOUND)
 
-        # uninstall the app on wp8 by product ID
-        try:
-            uninstall_cmd = '"%s" /uninstall %s /targetdevice:xd' % (self.deploy_tool, product_id)
-            self._run_cmd(uninstall_cmd)
-        except:
-            pass
+        if not self._no_uninstall:
+            # uninstall the app on wp8 by product ID
+            try:
+                uninstall_cmd = '"%s" /uninstall %s /targetdevice:xd' % (self.deploy_tool, product_id)
+                self._run_cmd(uninstall_cmd)
+            except:
+                pass
 
     def deploy_linux(self, dependencies):
         if not self._platforms.is_linux_active():
@@ -179,10 +184,12 @@ def deploy_android(self, dependencies):
         sdk_root = cocos.check_environment_variable('ANDROID_SDK_ROOT')
         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)
-        self._run_cmd(adb_uninstall)
-        adb_install = "%s install \"%s\"" % (adb_path, apk_path)
+        if not self._no_uninstall:
+            #TODO detect if the application is installed before running this
+            adb_uninstall = "%s uninstall %s" % (adb_path, self.package)
+            self._run_cmd(adb_uninstall)
+
+        adb_install = "%s install -r \"%s\"" % (adb_path, apk_path)
         self._run_cmd(adb_install)
 
     def deploy_tizen(self, dependencies):
@@ -197,11 +204,13 @@ def deploy_tizen(self, dependencies):
         # uninstall old app
         tizen_studio_path = cocos.check_environment_variable("TIZEN_STUDIO_HOME")
         tizen_cmd_path = cocos.CMDRunner.convert_path_to_cmd(os.path.join(tizen_studio_path, "tools", "ide", "bin", "tizen"))
-        try:
-            uninstall_cmd = "%s uninstall -p %s" % (tizen_cmd_path, self.tizen_packageid)
-            self._run_cmd(uninstall_cmd)
-        except Exception:
-            pass
+
+        if not self._no_uninstall:
+            try:
+                uninstall_cmd = "%s uninstall -p %s" % (tizen_cmd_path, self.tizen_packageid)
+                self._run_cmd(uninstall_cmd)
+            except Exception:
+                pass
 
         # install app
         compile_dep = dependencies["compile"]