Merge pull request cocos2d#164 from natural-law/develop

Solve the error when running app on iOS simulator in cocos2d-x 3.3

Author: minggo

bin/cocos.py

@@ -282,6 +282,27 @@ def check_environment_variable(var):
 
     return value
 
+def get_xcode_version():
+    commands = [
+        "xcodebuild",
+        "-version"
+    ]
+    child = subprocess.Popen(commands, stdout=subprocess.PIPE)
+
+    xcode = None
+    version = None
+    for line in child.stdout:
+        if 'Xcode' in line:
+            xcode, version = str.split(line, ' ')
+
+    child.wait()
+
+    if xcode is None:
+        message = "Xcode wasn't installed"
+        raise CCPluginError(message)
+
+    return version
+
 def copy_files_in_dir(src, dst):
 
     for item in os.listdir(src):

plugins/project_compile/project_compile.py

@@ -428,23 +428,7 @@ def build_android(self):
         cocos.Logging.info("build succeeded.")
 
     def check_ios_mac_build_depends(self):
-        commands = [
-            "xcodebuild",
-            "-version"
-        ]
-        child = subprocess.Popen(commands, stdout=subprocess.PIPE)
-
-        xcode = None
-        version = None
-        for line in child.stdout:
-            if 'Xcode' in line:
-                xcode, version = str.split(line, ' ')
-
-        child.wait()
-
-        if xcode is None:
-            message = "Xcode wasn't installed"
-            raise cocos.CCPluginError(message)
+        version = cocos.get_xcode_version()
 
         if version <= '5':
             message = "Update xcode please"
@@ -600,7 +584,8 @@ def build_ios(self):
                 "%s" % "-arch i386" if self.use_sdk == 'iphonesimulator' else '',
                 "-sdk",
                 "%s" % self.use_sdk,
-                "CONFIGURATION_BUILD_DIR=%s" % (output_dir)
+                "CONFIGURATION_BUILD_DIR=%s" % (output_dir),
+                "%s" % "VALID_ARCHS=\"i386\"" if self.use_sdk == 'iphonesimulator' else ''
                 ])
 
             if self._sign_id is not None:

plugins/project_run/bin/ios-sim

@@ -53,7 +53,17 @@ def _check_custom_options(self, args):
         self._mode = args.mode
         self._host = args.host
         self._browser = args.browser
-        
+
+    def get_ios_sim_name(self):
+        # get the version of xcodebuild
+        ver = cocos.get_xcode_version()
+
+        if ver.startswith("5"):
+            ret = "ios-sim-xcode5"
+        else:
+            ret = "ios-sim-xcode6"
+
+        return ret
 
     def run_ios_sim(self, dependencies):
         if not self._platforms.is_ios_active():
@@ -64,7 +74,7 @@ def run_ios_sim(self, dependencies):
             cocos.Logging.warning("The generated app is for device. Can't run it on simulator.")
             cocos.Logging.warning("The signed app & ipa are generated in path : %s" % os.path.dirname(deploy_dep._iosapp_path))
         else:
-            iossim_exe_path = os.path.join(os.path.dirname(__file__), 'bin', 'ios-sim')
+            iossim_exe_path = os.path.join(os.path.dirname(__file__), 'bin', self.get_ios_sim_name())
             launch_sim = "%s launch \"%s\" &" % (iossim_exe_path, deploy_dep._iosapp_path)
             self._run_cmd(launch_sim)