Commits

Tuukka Norri committed e542268

Moved the OCMock target to Unit tests to make linking easier

Comments (0)

Files changed (2)

BaseTen.xcodeproj/project.pbxproj

 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXLegacyTarget section */
-		538F8F2F1194D09100FB956D /* OCMock */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "-f \"$(SRCROOT)/Tools/OCMock.mk\" $(ACTION)";
-			buildConfigurationList = 538F8F301194D09100FB956D /* Build configuration list for PBXLegacyTarget "OCMock" */;
-			buildPhases = (
-			);
-			buildToolPath = /usr/bin/make;
-			buildWorkingDirectory = Contrib/OCMock;
-			dependencies = (
-			);
-			name = OCMock;
-			passBuildSettingsInEnvironment = 1;
-			productName = "RegexKit-test";
-		};
 		53C4E2441194B2BE003FB842 /* PCRE */ = {
 			isa = PBXLegacyTarget;
 			buildArgumentsString = "-f \"$(SRCROOT)/Tools/pcre.mk\" $(ACTION)";
 				537934A50E54B71B0006EC54 /* PostgreSQL-arm */,
 				53F1C5DF105C4BF200A610A8 /* RegexKit */,
 				53C4E2441194B2BE003FB842 /* PCRE */,
-				538F8F2F1194D09100FB956D /* OCMock */,
 			);
 		};
 /* End PBXProject section */
 			};
 			name = Release;
 		};
-		538F8F311194D09100FB956D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = OCMock;
-			};
-			name = Debug;
-		};
-		538F8F321194D09100FB956D /* Coverage */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = RegexKit;
-			};
-			name = Coverage;
-		};
-		538F8F331194D09100FB956D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = RegexKit;
-			};
-			name = Release;
-		};
 		53BD79F80E092ABD009CAFE6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		538F8F301194D09100FB956D /* Build configuration list for PBXLegacyTarget "OCMock" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				538F8F311194D09100FB956D /* Debug */,
-				538F8F321194D09100FB956D /* Coverage */,
-				538F8F331194D09100FB956D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		53BD79FA0E092ADB009CAFE6 /* Build configuration list for PBXAggregateTarget "Documentation" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

UnitTests/UnitTests.xcodeproj/project.pbxproj

 			remoteGlobalIDString = 535444130D634A47002A6C47;
 			remoteInfo = "BaseTen Framework + GC";
 		};
-		538F8F351194D0DC00FB956D /* PBXContainerItemProxy */ = {
+		538F90521194DFD100FB956D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 530A435E0A5C0E0100A4722B /* BaseTen.xcodeproj */;
+			containerPortal = 530A43530A5C0DC500A4722B /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 538F8F2F1194D09100FB956D;
+			remoteGlobalIDString = 538F904E1194DF9E00FB956D /* OCMock */;
 			remoteInfo = OCMock;
 		};
 		53A0DAD80F4B6DE500434E4E /* PBXContainerItemProxy */ = {
 		};
 /* End PBXGroup section */
 
+/* Begin PBXLegacyTarget section */
+		538F904E1194DF9E00FB956D /* OCMock */ = {
+			isa = PBXLegacyTarget;
+			buildArgumentsString = "-f \"$(SRCROOT)/../Tools/OCMock.mk\" $(ACTION)";
+			buildConfigurationList = 538F906C1194DFE900FB956D /* Build configuration list for PBXLegacyTarget "OCMock" */;
+			buildPhases = (
+			);
+			buildToolPath = /usr/bin/make;
+			buildWorkingDirectory = ../Contrib/OCMock;
+			dependencies = (
+			);
+			name = OCMock;
+			passBuildSettingsInEnvironment = 1;
+			productName = OCMock;
+		};
+/* End PBXLegacyTarget section */
+
 /* Begin PBXNativeTarget section */
 		530A438B0A5C0FD000A4722B /* UnitTests */ = {
 			isa = PBXNativeTarget;
 			);
 			dependencies = (
 				53D03BB90DE82987002D14C4 /* PBXTargetDependency */,
-				538F8F361194D0DC00FB956D /* PBXTargetDependency */,
+				538F90531194DFD100FB956D /* PBXTargetDependency */,
 			);
 			name = UnitTests;
 			productName = UnitTests;
 			targets = (
 				530A438B0A5C0FD000A4722B /* UnitTests */,
 				53A0DAD40F4B6DDC00434E4E /* Coverage */,
+				538F904E1194DF9E00FB956D /* OCMock */,
 			);
 		};
 /* End PBXProject section */
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		538F8F361194D0DC00FB956D /* PBXTargetDependency */ = {
+		538F90531194DFD100FB956D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = OCMock;
-			targetProxy = 538F8F351194D0DC00FB956D /* PBXContainerItemProxy */;
+			target = 538F904E1194DF9E00FB956D /* OCMock */;
+			targetProxy = 538F90521194DFD100FB956D /* PBXContainerItemProxy */;
 		};
 		53A0DAD90F4B6DE500434E4E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			};
 			name = Release;
 		};
+		538F904F1194DF9E00FB956D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = OCMock;
+			};
+			name = Debug;
+		};
+		538F90501194DF9E00FB956D /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = OCMock;
+			};
+			name = Coverage;
+		};
+		538F90511194DF9E00FB956D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = OCMock;
+			};
+			name = Release;
+		};
 		53A0DAD50F4B6DDC00434E4E /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		538F906C1194DFE900FB956D /* Build configuration list for PBXLegacyTarget "OCMock" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				538F904F1194DF9E00FB956D /* Debug */,
+				538F90501194DF9E00FB956D /* Coverage */,
+				538F90511194DF9E00FB956D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		53A0DADE0F4B6E6E00434E4E /* Build configuration list for PBXAggregateTarget "Coverage" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.