-[IOS8] Added x86_64 slice to make.py to be able to build and test in…

… 64 bit simulators.
phoboslab · Sep 30, 2014 · 8d6d8d8 · 8d6d8d8
1 parent d7e6445
commit 8d6d8d8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/xcodebuild.py b/xcodebuild.py
@@ -44,7 +44,7 @@ def _get_sdk_string(self):
                          if arch.startswith("arm")]) > 0
         is_simulator = len([arch for arch in self.archs
                             if arch.startswith("i386") or
-                            arch.startswith("x64")]) > 0
+                            arch.startswith("x86_64")]) > 0
         if is_device and is_simulator:
             raise PebbleXcodeBuildException("Can't build for Device and"
                                             "Simulator in one go! (archs=%s)" %
@@ -127,11 +127,13 @@ def __init__(self, project=None, workspace=None, scheme=None,
         self.devicebuildarmv7 = XcodeBuild(project, derived_data_path=derived_data_path)
         self.devicebuildarmv7s = XcodeBuild(project, derived_data_path=derived_data_path)
         self.simulatorbuild = XcodeBuild(project, derived_data_path=derived_data_path)
+        self.simulatorbuild64 = XcodeBuild(project, derived_data_path=derived_data_path)
         self.outdir = outdir
         for (bld, archs) in [self.devicebuildarm64, ["arm64"]], \
                             [self.devicebuildarmv7, ["armv7"]], \
                             [self.devicebuildarmv7s, ["armv7s"]], \
-                            [self.simulatorbuild, ["i386"]]:
+                            [self.simulatorbuild, ["i386"]], \
+                            [self.simulatorbuild64, ["x86_64"]]:
             bld.archs = archs
             bld.scheme = scheme
             bld.conf = conf
@@ -146,6 +148,7 @@ def build(self):
         self.devicebuildarmv7.build()
         self.devicebuildarmv7s.build()
         self.simulatorbuild.build()
+        self.simulatorbuild64.build()
 
         # Create the framework directory structure:
         temp_dir = tempfile.mkdtemp()
@@ -171,6 +174,7 @@ def build(self):
                     self.devicebuildarmv7.built_product_path(),
                     self.devicebuildarmv7s.built_product_path(),
                     self.simulatorbuild.built_product_path(),
+                    self.simulatorbuild64.built_product_path(),
                     "-output", lib_path]
         logging.debug("Executing: %s" % " ".join(lipo_cmd))
         if subprocess.call(lipo_cmd):