Merge pull request #366 from hylthink/v3

fault-tolerant. call encrypt if and only if used cocos package to import plugin

Author: Bin Zhang

config.json

@@ -1,6 +1,6 @@
 {
     "version":"v3-console-13",
-    "zip_file_size":"42887049",
+    "zip_file_size":"42887263",
     "repo_name":"console-binary",
     "repo_parent":"https://github.com/natural-law/"
 }

plugins/plugin_compile/build_android.py

@@ -493,14 +493,15 @@ def do_build_apk(self, build_mode, no_apk, output_dir, custom_step_args, compile
 
         ##cocospackage
         try:
-            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 --runincocos --runinbuild --noupdate' % (path, self.app_android_root)
-            self._run_cmd(cmd)
+            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
 

plugins/plugin_compile/project_compile.py

@@ -642,14 +642,15 @@ def build_ios(self):
 
         #cocospackage
         try:
-            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 --platform ios --runincocos --runinbuild --noupdate' % (path, self._project.get_project_dir())
-            self._run_cmd(cmd)
+            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