Просмотр исходного кода

Merge pull request #67 from jagreenwood/enhancement/universal_build

Adds an aggregate target which runs a script to build a universal fra…
Marcin Krzyzanowski 10 лет назад
Родитель
Сommit
82fd46754b
2 измененных файлов с 58 добавлено и 0 удалено
  1. 2 0
      .gitignore
  2. 56 0
      CryptoSwift.xcodeproj/project.pbxproj

+ 2 - 0
.gitignore

@@ -14,3 +14,5 @@ xcuserdata
 DerivedData
 *.xcuserstate
 timeline.xctimeline
+
+/Framework

+ 56 - 0
CryptoSwift.xcodeproj/project.pbxproj

@@ -6,6 +6,20 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		3F8849E11B0647D6006AB604 /* CryptoSwift-Universal */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 3F8849E21B0647D6006AB604 /* Build configuration list for PBXAggregateTarget "CryptoSwift-Universal" */;
+			buildPhases = (
+				3F8849E51B0647DD006AB604 /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "CryptoSwift-Universal";
+			productName = "CryptoSwift-Universal";
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		750A54601992D2680017DA75 /* MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750A545F1992D2680017DA75 /* MD5.swift */; };
 		75100F8F19B0BC890005C5F5 /* Poly1305Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75100F8E19B0BC890005C5F5 /* Poly1305Tests.swift */; };
@@ -343,6 +357,9 @@
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = "Marcin Krzyzanowski";
 				TargetAttributes = {
+					3F8849E11B0647D6006AB604 = {
+						CreatedOnToolsVersion = 6.3.1;
+					};
 					754BE45419693E190098E6F3 = {
 						CreatedOnToolsVersion = 6.0;
 					};
@@ -366,6 +383,7 @@
 			targets = (
 				754BE45419693E190098E6F3 /* CryptoSwift */,
 				754BE45F19693E190098E6F3 /* CryptoSwiftTests */,
+				3F8849E11B0647D6006AB604 /* CryptoSwift-Universal */,
 			);
 		};
 /* End PBXProject section */
@@ -388,6 +406,22 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		3F8849E51B0647DD006AB604 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "TARGET_NAME=\"CryptoSwift\"\nFRAMEWORK_NAME=\"CryptoSwift\"\nINSTALL_DIR=\"Framework\"\nFRAMEWORK=\"${INSTALL_DIR}/${FRAMEWORK_NAME}.framework\"\n\nif [ -d \"${INSTALL_DIR}\" ]\nthen\nrm -rf \"${INSTALL_DIR}\"\nfi\n\nmkdir \"${INSTALL_DIR}\"\n\nWRK_DIR=\"build\"\nDEVICE_DIR=\"${WRK_DIR}/Release-iphoneos/${FRAMEWORK_NAME}.framework\"\nSIMULATOR_DIR=\"${WRK_DIR}/Release-iphonesimulator/${FRAMEWORK_NAME}.framework\"\n\nxcodebuild -configuration \"Release\" -target \"${TARGET_NAME}\" -sdk iphoneos SYMROOT=$(PWD)/${WRK_DIR}\nxcodebuild -configuration \"Release\" -target \"${TARGET_NAME}\" -sdk iphonesimulator SYMROOT=$(PWD)/${WRK_DIR}\n\nlipo -create \"${DEVICE_DIR}/${FRAMEWORK_NAME}\" \"${SIMULATOR_DIR}/${FRAMEWORK_NAME}\" -output \"${DEVICE_DIR}/${FRAMEWORK_NAME}\"\n\ncp -R \"${DEVICE_DIR}\" \"${INSTALL_DIR}/\"\n\nif [ -d \"${SIMULATOR_DIR}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" ]; then\ncp -f -R \"${SIMULATOR_DIR}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" \"${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" | echo\nfi\n\nrm -r \"${WRK_DIR}\"";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		754BE45019693E190098E6F3 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -481,6 +515,20 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		3F8849E31B0647D6006AB604 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		3F8849E41B0647D6006AB604 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		754BE46919693E190098E6F3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -665,6 +713,14 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		3F8849E21B0647D6006AB604 /* Build configuration list for PBXAggregateTarget "CryptoSwift-Universal" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3F8849E31B0647D6006AB604 /* Debug */,
+				3F8849E41B0647D6006AB604 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 		754BE44F19693E190098E6F3 /* Build configuration list for PBXProject "CryptoSwift" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (