Improve cocos run for support XCode 8. (#388)

Author: Bin Zhang

plugins/plugin_run/project_run.py

@@ -19,6 +19,8 @@
 import BaseHTTPServer
 import webbrowser
 import threading
+import subprocess
+import re
 
 class CCPluginRun(cocos.CCPlugin):
     """
@@ -67,14 +69,113 @@ def _check_custom_options(self, args):
     def get_ios_sim_name(self):
         # get the version of xcodebuild
         ver = cocos.get_xcode_version()
+        match = re.match(r'(\d+).*', ver)
+        ret = None
+        if match:
+            ver_num = int(match.group(1))
+            if ver_num <= 5:
+                ret = "ios-sim-xcode5"
+            elif ver_num < 8:
+                ret = "ios-sim-xcode6"
 
-        if ver.startswith("5"):
-            ret = "ios-sim-xcode5"
-        else:
-            ret = "ios-sim-xcode6"
+        return ret
 
+    def _get_cmd_output(self, cmds):
+        child = subprocess.Popen(cmds, stdout=subprocess.PIPE)
+        out = child.stdout.read()
+        child.wait()
+        errCode = child.returncode
+
+        return (errCode, out)
+
+    def _get_simulator_id(self):
+        (errCode, out) = self._get_cmd_output([ "xcrun", "instruments", "-s" ])
+        names = []
+        if errCode == 0:
+            pattern = r'(^iPhone[^\[]+)\[(.*)\]\s*\(Simulator\)'
+            lines = out.split('\n')
+            for line in lines:
+                match = re.match(pattern, line)
+                if match:
+                    info = {
+                        "name" : match.group(1),
+                        'id' : match.group(2)
+                    }
+                    names.append(info)
+
+        ret = None
+        retName = None
+        phoneTypeNum = 0
+        phoneType = ''
+        iosVer = 0
+        if len(names) > 0:
+            name_pattern = r'iPhone\s+((\d+)[^\(]+)\((.*)\)'
+            for info in names:
+                name = info["name"]
+                id = info["id"]
+                if name.find('Apple Watch') > 0:
+                    continue
+
+                match = re.match(name_pattern, name)
+                if match:
+                    # get the matched data
+                    typeNum = int(match.group(2))
+                    tmpType = match.group(1)
+                    tmpIOSVer = float(match.group(3))
+
+                    if ((typeNum > phoneTypeNum) or
+                        (typeNum == phoneTypeNum and tmpType > phoneType) or
+                        (typeNum == phoneTypeNum and tmpType == phoneType and tmpIOSVer > iosVer)):
+                        # find the max phone type number first
+                        ret = id
+                        retName = name.strip()
+                        phoneTypeNum = typeNum
+                        phoneType = tmpType
+                        iosVer = tmpIOSVer
+
+        if ret is None:
+            raise cocos.CCPluginError('Get simulator failed!')
+
+        print('Using simulator: %s' % retName)
         return ret
 
+    def _get_bundle_id(self, app_path):
+        plistFile = os.path.join(app_path, 'Info.plist')
+        (errCode, out) = self._get_cmd_output([ 'plutil', '-convert', 'json', '-o', '-', plistFile ])
+        ret = None
+        if errCode == 0:
+            import json
+            jsonObj = json.loads(out)
+            if jsonObj is not None and jsonObj.has_key('CFBundleIdentifier'):
+                ret = jsonObj['CFBundleIdentifier']
+
+        if ret is None:
+            raise cocos.CCPluginError('Get the bundle ID of app %s failed' % app_path)
+
+        return ret
+
+    def _run_ios_app(self, ios_app_path):
+        if not cocos.os_is_mac():
+            raise cocos.CCPluginError('Now only support run iOS simulator on Mac OS')
+
+        # get bundle id
+        bundle_id = self._get_bundle_id(ios_app_path)
+
+        # find simulator
+        simulator_id = self._get_simulator_id()
+
+        try:
+            # run the simulator
+            self._run_cmd('xcrun instruments -w "%s"' % simulator_id)
+        except Exception as e:
+            pass
+
+        # install app
+        self._run_cmd('xcrun simctl install "%s" "%s"' % (simulator_id, ios_app_path))
+
+        # run app
+        self._run_cmd('xcrun simctl launch "%s" "%s"' % (simulator_id, bundle_id))
+
     def run_ios_sim(self, dependencies):
         if not self._platforms.is_ios_active():
             return
@@ -84,13 +185,19 @@ def run_ios_sim(self, dependencies):
             cocos.Logging.warning(MultiLanguage.get_string('RUN_WARNING_IOS_FOR_DEVICE_FMT',
                                                            os.path.dirname(deploy_dep._iosapp_path)))
         else:
-            if getattr(sys, 'frozen', None):
-                cur_dir = os.path.realpath(os.path.dirname(sys.executable))
+            ios_sim_name = self.get_ios_sim_name()
+            if ios_sim_name is None:
+                # there is not a ios-sim for current installed xcode
+                # try to use xcrun commands
+                self._run_ios_app(deploy_dep._iosapp_path)
             else:
-                cur_dir = os.path.realpath(os.path.dirname(__file__))
-            iossim_exe_path = os.path.join(cur_dir, 'bin', self.get_ios_sim_name())
-            launch_sim = "%s launch \"%s\" &" % (iossim_exe_path, deploy_dep._iosapp_path)
-            self._run_cmd(launch_sim)
+                if getattr(sys, 'frozen', None):
+                    cur_dir = os.path.realpath(os.path.dirname(sys.executable))
+                else:
+                    cur_dir = os.path.realpath(os.path.dirname(__file__))
+                iossim_exe_path = os.path.join(cur_dir, 'bin', ios_sim_name)
+                launch_sim = "%s launch \"%s\" &" % (iossim_exe_path, deploy_dep._iosapp_path)
+                self._run_cmd(launch_sim)
 
     def _run_with_desktop_options(self, cmd):
         if self._no_console: