Merge pull request #361 from hylthink/hylthink-v3

add cocos package 0.8.1

Author: Bin Zhang

config.json

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

plugins/plugin_compile/build_android.py

@@ -491,6 +491,20 @@ 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:
+            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' % (path, self.app_android_root)
+            self._run_cmd(cmd)
+        except:
+            pass
+        
+
         # check the project config & compile the script files
         if self._project._is_lua_project():
             compile_obj.compile_lua_scripts(assets_dir, assets_dir)

plugins/plugin_compile/project_compile.py

@@ -640,6 +640,20 @@ def build_ios(self):
             raise cocos.CCPluginError(MultiLanguage.get_string('COMPILE_ERROR_BUILD_ON_MAC'),
                                       cocos.CCPluginError.ERROR_WRONG_ARGS)
 
+        #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' % (path, self._project.get_project_dir())
+            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

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

plugins/plugin_package/cocospackage.bat

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

plugins/plugin_package/cocospackage.py

@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""
+@license: Apache Licence 
+@contact: [email protected]
+@author = 'daisy'
+@software: PyCharm
+@file: cocospackage.py
+@time: 16/5/25 上午11:33
+"""
+import os
+import sys
+import platform
+import zipfile
+import time
+import subprocess
+
+
+def _get_currency_path():
+    path = ''
+    if getattr(sys, 'frozen', None):
+        path = os.path.realpath(os.path.dirname(sys.executable))
+    else:
+        path = os.path.realpath(os.path.dirname(__file__))
+    return path
+
+def main():
+    #update
+    #unzip cocospackage.zip
+    name = 'cocospackage.zip'
+    currency_path = _get_currency_path()
+    file_path = os.path.join(currency_path, name)
+    if os.path.isfile(file_path):
+        time.sleep(0.5)
+        fh = open(file_path, 'rb')
+        z = zipfile.ZipFile(fh)
+        for n in z.namelist():
+            outfile = open(os.path.join(currency_path, n), 'wb')
+            try:
+                data = z.read(n)
+            except:
+                raise RuntimeError('failed to find ' + n + 'in archive ' + file_path)
+            outfile.write(data)
+            outfile.close()
+        fh.close()
+        os.remove(file_path)
+
+    #import package
+    path = ''
+    architecture = platform.architecture()[0]
+    if '64' in architecture:
+        path = os.path.join(currency_path, 'bin', architecture)
+    else:
+        path = os.path.join(currency_path, 'bin', architecture)
+    # download the bin folder
+    if not os.path.exists(path):
+        download_cmd_path = os.path.join(currency_path, os.pardir, os.pardir)
+        subprocess.call("python %s -f -r no" % (os.path.join(download_cmd_path, "download-bin.py")), shell=True, cwd=download_cmd_path)
+    sys.path.append(path)
+    import package 
+    package.main()
+
+if __name__ == '__main__':
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
+    main()

plugins/plugin_package/plugin_package.py

@@ -30,8 +30,13 @@ def parse_args(self, argv):
         return {"command": argv[0]}
 
     def run(self, argv, dependencies):
-        cmd = self._get_sdkbox_path() + ' --runincocos ' + ' '.join(argv)
-        ret = self._run_cmd(cmd)
+        if '--sdkbox' in argv:
+            argv.remove('--sdkbox')
+            cmd = self._get_sdkbox_path() + ' --runincocos ' + ' '.join(argv)
+            ret = self._run_cmd(cmd)
+        else:
+            cmd = self._get_cocospackage_path() + ' --runincocos ' + ' '.join(argv)
+            ret = self._run_cmd(cmd)
         if 0 != ret:
             message = MultiLanguage.get_string('COCOS_ERROR_RUNNING_CMD_RET_FMT', str(ret))
             raise cocos.CCPluginError(message, cocos.CCPluginError.ERROR_RUNNING_CMD)
@@ -48,5 +53,13 @@ def _get_sdkbox_path(self):
             path = os.path.realpath(os.path.dirname(__file__))
         return os.path.join(path, 'sdkbox')
 
+    def _get_cocospackage_path(self):
+        path = ''
+        if getattr(sys, 'frozen', None):
+            path = os.path.realpath(os.path.dirname(sys.executable))
+        else:
+            path = os.path.realpath(os.path.dirname(__file__))
+        return os.path.join(path, 'cocospackage')
+
     def print_help(self):
             print(MultiLanguage.get_string('PACKAGE_HELP'))