Merge pull request #372 from hylthink/v3

cocos package so change pyc

Author: Bin Zhang

config.json

@@ -1,6 +1,6 @@
 {
-    "version":"v3-console-15",
-    "zip_file_size":"428890526",
+    "version":"v3-console-16",
+    "zip_file_size":"38343506",
     "repo_name":"console-binary",
     "repo_parent":"https://github.com/cocos2d/"
 }

plugins/plugin_compile/build_android.py

@@ -490,20 +490,6 @@ def do_build_apk(self, build_mode, no_apk, output_dir, custom_step_args, compile
 
         # copy resources
         self._copy_resources(custom_step_args, assets_dir)
-
-        ##cocospackage
-        try:
-            if os.path.exists(os.path.join(self._project.get_project_dir(), '.cocos-package.json')):
-                path = ''
-                if getattr(sys, 'frozen', None):
-                    path = os.path.realpath(os.path.dirname(sys.executable))
-                else:
-                    path = os.path.realpath(os.path.dirname(__file__))
-                path = os.path.join(path, '../plugin_package/cocospackage')
-                cmd = '%s encrypt -p %s --mode %s --runincocos --runinbuild --noupdate' % (path, self.app_android_root, build_mode)
-                self._run_cmd(cmd)
-        except:
-            pass
 
 
         # check the project config & compile the script files

plugins/plugin_compile/project_compile.py

@@ -639,22 +639,7 @@ def build_ios(self):
         if not cocos.os_is_mac():
             raise cocos.CCPluginError(MultiLanguage.get_string('COMPILE_ERROR_BUILD_ON_MAC'),
                                       cocos.CCPluginError.ERROR_WRONG_ARGS)
-
-        #cocospackage
-        try:
-            if os.path.exists(os.path.join(self._project.get_project_dir(), '.cocos-package.json')):
-                path = ''
-                if getattr(sys, 'frozen', None):
-                    path = os.path.realpath(os.path.dirname(sys.executable))
-                else:
-                    path = os.path.realpath(os.path.dirname(__file__))
-                path = os.path.join(path, '../plugin_package/cocospackage')
-                cmd = '%s encrypt -p %s --mode %s --platform ios --runincocos --runinbuild --noupdate' % (path, self._project.get_project_dir(), self._mode)
-                self._run_cmd(cmd)
-        except:
-            pass
-        
-        
+              
         if self._sign_id is not None:
             cocos.Logging.info(MultiLanguage.get_string('COMPILE_INFO_IOS_SIGN_FMT', self._sign_id))
             self.use_sdk = 'iphoneos'

plugins/plugin_package/cocospackage

@@ -1,3 +1,3 @@
 #!/bin/bash -l
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-python ${DIR}/cocospackage.py "$@"
+python ${DIR}/cocospackage.pyc "$@"

plugins/plugin_package/cocospackage.bat

@@ -1,3 +1,3 @@
 SET script_path=%~dp0
 
-python %script_path%cocospackage.py %*
+python %script_path%cocospackage.pyc %*

plugins/plugin_package/cocospackage.py

@@ -30,12 +30,14 @@ def parse_args(self, argv):
         return {"command": argv[0]}
 
     def run(self, argv, dependencies):
-        if '--sdkbox' in argv:
-            argv.remove('--sdkbox')
-            cmd = self._get_sdkbox_path() + ' --runincocos ' + ' '.join(argv)
+        if '--anysdk' in argv:
+            argv.remove('--anysdk')
+            cmd = self._get_cocospackage_path() + ' --runincocos ' + ' '.join(argv)
             ret = self._run_cmd(cmd)
         else:
-            cmd = self._get_cocospackage_path() + ' --runincocos ' + ' '.join(argv)
+            if '--sdkbox' in argv:
+                argv.remove('--sdkbox')
+            cmd = self._get_sdkbox_path() + ' --runincocos ' + ' '.join(argv)
             ret = self._run_cmd(cmd)
         if 0 != ret:
             message = MultiLanguage.get_string('COCOS_ERROR_RUNNING_CMD_RET_FMT', str(ret))