Merge branch 'v3' of github.com:kosmosR2/cocos2d-console into HEAD

Author: misasagikosmos

bin/strings.json

@@ -176,6 +176,7 @@
         "COMPILE_INFO_BUILDING" : "Building...",
         "COMPILE_INFO_FIND_IN_REG_FMT" : "Finding VS in registry : %s",
         "COMPILE_INFO_REQUIRED_VS_FMT" : "Required VS version : %s",
+        "COMPILE_INFO_USE_COCOAPODS" : "CocoaPods detected: use xcworkspace for build",
         "COMPILE_ERROR_WRONG_MODE_FMT" : "Value of '-m' should be one of %s.",
         "COMPILE_ERROR_WRONG_NDK_MODE_FMT" : "Value of '--ndk-mode' should be one of %s.",
         "COMPILE_ERROR_WRONG_VS_VER_FMT" : "VS %d is not supported.",
@@ -517,6 +518,7 @@
         "COMPILE_INFO_BUILDING" : "正在编译...",
         "COMPILE_INFO_FIND_IN_REG_FMT" : "在 %s 注册表中查找 VS 安装路径。",
         "COMPILE_INFO_REQUIRED_VS_FMT" : "要求的 VS 版本：%s",
+        "COMPILE_INFO_USE_COCOAPODS" : "检测到 CocoaPods：使用 xcworkspace 进行编译。",
         "COMPILE_ERROR_WRONG_MODE_FMT" : "'-m' 参数取值范围：%s。",
         "COMPILE_ERROR_WRONG_NDK_MODE_FMT" : "'--ndk-mode' 参数取值范围：%s。",
         "COMPILE_ERROR_WRONG_VS_VER_FMT" : "不支持 VS %d。",
@@ -857,6 +859,7 @@
         "COMPILE_INFO_BUILDING" : "正在編譯...",
         "COMPILE_INFO_FIND_IN_REG_FMT" : "在 %s 註冊表中查找 VS 安裝路徑。",
         "COMPILE_INFO_REQUIRED_VS_FMT" : "要求的 VS 版本：%s",
+        "COMPILE_INFO_USE_COCOAPODS" : "檢測到 CocoaPods：使用 xcworkspace 进行编译。",
         "COMPILE_ERROR_WRONG_MODE_FMT" : "'-m' 參數取值範圍：%s。",
         "COMPILE_ERROR_WRONG_NDK_MODE_FMT" : "'--ndk-mode' 參數取值範圍：%s。",
         "COMPILE_ERROR_WRONG_VS_VER_FMT" : "不支持 VS %d。",

plugins/plugin_compile/build_android.py

@@ -497,11 +497,14 @@ def do_build_apk(self, build_mode, no_apk, output_dir, custom_step_args, compile
 
             # only build 64bit
             if build_type == self.LuaBuildType.ONLY_BUILD_64BIT:
-                dst_dir = os.path.join(assets_dir, 'src/64bit')
-                compile_obj.compile_lua_scripts(src_dir, dst_dir, True)
-                # remove unneeded lua files
-                compile_obj._remove_file_with_ext(src_dir, '.lua')
-                shutil.rmtree(os.path.join(src_dir, 'cocos'))
+                if build_mode == 'release':
+                    dst_dir = os.path.join(assets_dir, 'src/64bit')
+                    compile_obj.compile_lua_scripts(src_dir, dst_dir, True)
+                    # remove unneeded lua files
+                    compile_obj._remove_file_with_ext(src_dir, '.lua')
+                    shutil.rmtree(os.path.join(src_dir, 'cocos'))
+                else:
+                    compile_obj.compile_lua_scripts(src_dir, src_dir, False)
 
             # only build 32bit
             if build_type == self.LuaBuildType.ONLY_BUILD_32BIT:

plugins/plugin_compile/project_compile.py

@@ -565,6 +565,13 @@ def check_ios_mac_build_depends(self):
 
         self.project_name = name
         self.xcodeproj_name = xcodeproj_name
+        project_dir = self._platforms.project_path()
+        podfile = os.path.join(project_dir, 'Podfile')
+        self.xcworkspace = os.path.join(project_dir, name+'.xcworkspace')
+        self.cocoapods = os.path.exists(self.xcworkspace) and os.path.exists(podfile)
+        if self.cocoapods:
+          cocos.Logging.info(MultiLanguage.get_string('COMPILE_INFO_USE_COCOAPODS'))
+
 
     def _remove_res(self, target_path):
         build_cfg_dir = self._build_cfg_path()
@@ -739,11 +746,11 @@ def build_ios(self):
 
             command = ' '.join([
                 "xcodebuild",
-                "-project",
-                "\"%s\"" % projectPath,
+                "-workspace" if self.cocoapods else "-project",
+                "\"%s\"" % self.xcworkspace if self.cocoapods else projectPath,
                 "-configuration",
                 "%s" % 'Debug' if self._mode == 'debug' else 'Release',
-                "-target",
+                "-scheme" if self.cocoapods else "-target",
                 "\"%s\"" % targetName,
                 "%s" % "-arch i386" if self.use_sdk == 'iphonesimulator' else '',
                 "-sdk",
@@ -877,11 +884,11 @@ def build_mac(self):
 
             command = ' '.join([
                 "xcodebuild",
-                "-project",
-                "\"%s\"" % projectPath,
+                "-workspace" if self.cocoapods else "-project",
+                "\"%s\"" % self.xcworkspace if self.cocoapods else projectPath,
                 "-configuration",
                 "%s" % 'Debug' if self._mode == 'debug' else 'Release',
-                "-target",
+                "-scheme" if self.cocoapods else "-target",
                 "\"%s\"" % targetName,
                 "CONFIGURATION_BUILD_DIR=\"%s\"" % (output_dir)
                 ])