Modified build script to build all archs separately

Author: phoboslab

xcodebuild.py

@@ -123,12 +123,14 @@ def __init__(self, project=None, workspace=None, scheme=None,
                  derived_data_path=None):
         self.scheme = scheme
         self.name = name
-        self.devicebuild = XcodeBuild(project,
-                                      derived_data_path=derived_data_path)
-        self.simulatorbuild = XcodeBuild(project,
-                                         derived_data_path=derived_data_path)
+        self.devicebuildarm64 = XcodeBuild(project, derived_data_path=derived_data_path)
+        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.outdir = outdir
-        for (bld, archs) in [self.devicebuild, ["arm64", "armv7", "armv7s"]], \
+        for (bld, archs) in [self.devicebuildarm64, ["arm64"]], \
+                            [self.devicebuildarmv7, ["armv7"]], \
+                            [self.devicebuildarmv7s, ["armv7s"]], \
                             [self.simulatorbuild, ["i386"]]:
             bld.archs = archs
             bld.scheme = scheme
@@ -140,7 +142,9 @@ def build(self):
             name = name.replace(" ", "-")
 
         # Run the builds of the libraries:
-        self.devicebuild.build()
+        self.devicebuildarm64.build()
+        self.devicebuildarmv7.build()
+        self.devicebuildarmv7s.build()
         self.simulatorbuild.build()
 
         # Create the framework directory structure:
@@ -159,11 +163,13 @@ def build(self):
                    os.path.join(framework_dir, name))
 
         # Move public headers:
-        os.renames(self.devicebuild.public_headers_path(), headers_dir)
+        os.renames(self.devicebuildarm64.public_headers_path(), headers_dir)
 
         # Use lipo to create one fat static library:
         lipo_cmd = ["lipo", "-create",
-                    self.devicebuild.built_product_path(),
+                    self.devicebuildarm64.built_product_path(),
+                    self.devicebuildarmv7.built_product_path(),
+                    self.devicebuildarmv7s.built_product_path(),
                     self.simulatorbuild.built_product_path(),
                     "-output", lib_path]
         logging.debug("Executing: %s" % " ".join(lipo_cmd))