Split ios and simulator builds

nextgis · Jun 18, 2017 · cd2955d · cd2955d
1 parent 55176f1
commit cd2955d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/Readme.md b/Readme.md
@@ -84,7 +84,8 @@ and copy tasks. Also special Android.mk and application.mk files with linked
 libraries and supported ABIs set.
 
 For iOS special Python script *build_framework.py* to build XCode framework.
-Special swift file with cast main C types is provided as well.
+Carthage support enabled. The special swift wrapper library is at
+[separate repository](https://github.com/nextgis/ios_maplib).
 
 # License
 

diff --git a/opt/ios/build_framework.py b/opt/ios/build_framework.py
@@ -238,12 +238,29 @@ def makeFramework(self, outdir, builddirs):
 
     print("Build in:" + args.out, file=sys.stderr)
 
-    b = Builder(args.repo,
-        [
-            ("armv7", "iPhoneOS"),
-            ("armv7s", "iPhoneOS"),
-            ("arm64", "iPhoneOS"),
-            ("i386", "iPhoneSimulator"),
-            ("x86_64", "iPhoneSimulator"),
-        ])
-    b.build(args.out)
+    if ios:
+        b1 = Builder(args.repo,
+            [
+                ("armv7", "iPhoneOS"),
+                ("armv7s", "iPhoneOS"),
+                ("arm64", "iPhoneOS"),
+            ])
+        b1.build(args.out + '-iphoneos')
+
+        b2 = Builder(args.repo,
+            [
+                ("i386", "iPhoneSimulator"),
+                ("x86_64", "iPhoneSimulator"),
+            ])
+        b2.build(args.out + '-iphonesimulator')
+
+    else:
+        b = Builder(args.repo,
+            [
+                ("armv7", "iPhoneOS"),
+                ("armv7s", "iPhoneOS"),
+                ("arm64", "iPhoneOS"),
+                ("i386", "iPhoneSimulator"),
+                ("x86_64", "iPhoneSimulator"),
+            ])
+        b.build(args.out)
diff --git a/opt/ios/ngstore.xcodeproj/project.pbxproj b/opt/ios/ngstore.xcodeproj/project.pbxproj
@@ -129,7 +129,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/usr/bin/python ${SRCROOT}/build_framework.py ${BUILD_DIR}/${CONFIGURATION}-iosuniversal";
+			shellScript = "/usr/bin/python ${SRCROOT}/build_framework.py ${BUILD_DIR}/${CONFIGURATION}";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -167,8 +167,8 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)-iosuniversal";
-				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)-iosuniversal";
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
+				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -218,8 +218,8 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)-iosuniversal";
-				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)-iosuniversal";
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
+				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;