Jelajahi Sumber

Relocate files to begin conversion to GoogleTest

Sam Jaffe 6 tahun lalu
induk
melakukan
09f5632f2b
3 mengubah file dengan 85 tambahan dan 17 penghapusan
  1. 85 17
      case-matcher.xcodeproj/project.pbxproj
  2. 0 0
      include/match/match.hpp
  3. 0 0
      test/match_test.cxx

+ 85 - 17
case-matcher.xcodeproj/project.pbxproj

@@ -6,9 +6,36 @@
 	objectVersion = 46;
 	objects = {
 
-/* Begin PBXBuildFile section */
-		CD78202B1E44DB26001D22E5 /* case_matcher_tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7820291E44DB26001D22E5 /* case_matcher_tc.cpp */; };
-/* End PBXBuildFile section */
+/* Begin PBXContainerItemProxy section */
+		CDEC1D9F2351663A0091D9F2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05818F861A685AEA0072A469;
+			remoteInfo = GoogleMock;
+		};
+		CDEC1DA12351663A0091D9F2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05E96ABD1A68600C00204102;
+			remoteInfo = gmock;
+		};
+		CDEC1DA32351663A0091D9F2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05E96B1F1A68634900204102;
+			remoteInfo = gtest;
+		};
+		CDEC1DA52351663A0091D9F2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 05818F901A685AEA0072A469;
+			remoteInfo = GoogleMockTests;
+		};
+/* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
 		CD7820201E44DAD1001D22E5 /* CopyFiles */ = {
@@ -23,10 +50,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		CD6E2CEC1D84BF64002C1FB3 /* match.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = match.hpp; sourceTree = "<group>"; };
-		CD78201D1E44DABD001D22E5 /* match.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = match.t.h; sourceTree = "<group>"; };
 		CD7820221E44DAD1001D22E5 /* case_matcher_tc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = case_matcher_tc; sourceTree = BUILT_PRODUCTS_DIR; };
-		CD7820291E44DB26001D22E5 /* case_matcher_tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = case_matcher_tc.cpp; sourceTree = "<group>"; };
+		CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
+		CDEC1E5623522DB20091D9F2 /* match_test.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = match_test.cxx; sourceTree = "<group>"; };
+		CDEC1E5723522DBF0091D9F2 /* match */ = {isa = PBXFileReference; lastKnownFileType = folder; name = match; path = include/match; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -43,8 +70,9 @@
 		CD6E2CD31D84BF3C002C1FB3 = {
 			isa = PBXGroup;
 			children = (
-				CD6E2CEA1D84BF45002C1FB3 /* src */,
-				CD78201C1E44DAAE001D22E5 /* test */,
+				CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */,
+				CDEC1E5723522DBF0091D9F2 /* match */,
+				CDEC1E5523522DB20091D9F2 /* test */,
 				CD6E2CDD1D84BF3C002C1FB3 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -57,21 +85,23 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CD6E2CEA1D84BF45002C1FB3 /* src */ = {
+		CDEC1D992351663A0091D9F2 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				CD6E2CEC1D84BF64002C1FB3 /* match.hpp */,
+				CDEC1DA02351663A0091D9F2 /* GoogleMock.framework */,
+				CDEC1DA22351663A0091D9F2 /* gmock.framework */,
+				CDEC1DA42351663A0091D9F2 /* gtest.framework */,
+				CDEC1DA62351663A0091D9F2 /* GoogleMockTests.xctest */,
 			);
-			name = src;
+			name = Products;
 			sourceTree = "<group>";
 		};
-		CD78201C1E44DAAE001D22E5 /* test */ = {
+		CDEC1E5523522DB20091D9F2 /* test */ = {
 			isa = PBXGroup;
 			children = (
-				CD78201D1E44DABD001D22E5 /* match.t.h */,
-				CD7820291E44DB26001D22E5 /* case_matcher_tc.cpp */,
+				CDEC1E5623522DB20091D9F2 /* match_test.cxx */,
 			);
-			name = test;
+			path = test;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -101,7 +131,7 @@
 		CD6E2CD41D84BF3C002C1FB3 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1030;
+				LastUpgradeCheck = 1110;
 				ORGANIZATIONNAME = "Sam Jaffe";
 				TargetAttributes = {
 					CD7820211E44DAD1001D22E5 = {
@@ -120,6 +150,12 @@
 			mainGroup = CD6E2CD31D84BF3C002C1FB3;
 			productRefGroup = CD6E2CDD1D84BF3C002C1FB3 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = CDEC1D992351663A0091D9F2 /* Products */;
+					ProjectRef = CDEC1D982351663A0091D9F2 /* GoogleMock.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				CD7820211E44DAD1001D22E5 /* case_matcher_tc */,
@@ -127,6 +163,37 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		CDEC1DA02351663A0091D9F2 /* GoogleMock.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = GoogleMock.framework;
+			remoteRef = CDEC1D9F2351663A0091D9F2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDEC1DA22351663A0091D9F2 /* gmock.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = gmock.framework;
+			remoteRef = CDEC1DA12351663A0091D9F2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDEC1DA42351663A0091D9F2 /* gtest.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = gtest.framework;
+			remoteRef = CDEC1DA32351663A0091D9F2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDEC1DA62351663A0091D9F2 /* GoogleMockTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = GoogleMockTests.xctest;
+			remoteRef = CDEC1DA52351663A0091D9F2 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXShellScriptBuildPhase section */
 		CD78202C1E44DB3B001D22E5 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -150,7 +217,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD78202B1E44DB26001D22E5 /* case_matcher_tc.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -261,6 +327,7 @@
 		CD7820271E44DAD1001D22E5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				HEADER_SEARCH_PATHS = /usr/local/include/;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -269,6 +336,7 @@
 		CD7820281E44DAD1001D22E5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				HEADER_SEARCH_PATHS = /usr/local/include/;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

match.hpp → include/match/match.hpp


match.t.h → test/match_test.cxx