Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

minor build setting changes. updated read me. namespaced current matc…

…her key in thread dictionary.
  • Loading branch information...
commit 49056ca5752aabf9d46ec23e9faaceeba627b152 1 parent 2c0846b
Peter Jihoon Kim authored January 09, 2012
72  Expecta.xcodeproj/project.pbxproj
@@ -37,16 +37,14 @@
37 37
 		AEBA779B14055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.h in Headers */ = {isa = PBXBuildFile; fileRef = AEBA779814055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.h */; settings = {ATTRIBUTES = (Public, ); }; };
38 38
 		AEBA779C14055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.m in Sources */ = {isa = PBXBuildFile; fileRef = AEBA779914055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.m */; };
39 39
 		AEBA779D14055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.m in Sources */ = {isa = PBXBuildFile; fileRef = AEBA779914055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.m */; };
40  
-		E1EB1BC313BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BBF13BEA1BE00E4C93B /* EXPDoubleTuple.h */; };
41  
-		E1EB1BC413BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BBF13BEA1BE00E4C93B /* EXPDoubleTuple.h */; };
  40
+		E1EB1BC313BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BBF13BEA1BE00E4C93B /* EXPDoubleTuple.h */; settings = {ATTRIBUTES = (Public, ); }; };
  41
+		E1EB1BC413BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BBF13BEA1BE00E4C93B /* EXPDoubleTuple.h */; settings = {ATTRIBUTES = (Public, ); }; };
42 42
 		E1EB1BC513BEA1BE00E4C93B /* EXPDoubleTuple.m in Sources */ = {isa = PBXBuildFile; fileRef = E1EB1BC013BEA1BE00E4C93B /* EXPDoubleTuple.m */; };
43 43
 		E1EB1BC613BEA1BE00E4C93B /* EXPDoubleTuple.m in Sources */ = {isa = PBXBuildFile; fileRef = E1EB1BC013BEA1BE00E4C93B /* EXPDoubleTuple.m */; };
44  
-		E1EB1BC713BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BC113BEA1BE00E4C93B /* EXPFloatTuple.h */; };
45  
-		E1EB1BC813BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BC113BEA1BE00E4C93B /* EXPFloatTuple.h */; };
  44
+		E1EB1BC713BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BC113BEA1BE00E4C93B /* EXPFloatTuple.h */; settings = {ATTRIBUTES = (Public, ); }; };
  45
+		E1EB1BC813BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EB1BC113BEA1BE00E4C93B /* EXPFloatTuple.h */; settings = {ATTRIBUTES = (Public, ); }; };
46 46
 		E1EB1BC913BEA1BE00E4C93B /* EXPFloatTuple.m in Sources */ = {isa = PBXBuildFile; fileRef = E1EB1BC213BEA1BE00E4C93B /* EXPFloatTuple.m */; };
47 47
 		E1EB1BCA13BEA1BE00E4C93B /* EXPFloatTuple.m in Sources */ = {isa = PBXBuildFile; fileRef = E1EB1BC213BEA1BE00E4C93B /* EXPFloatTuple.m */; };
48  
-		E930679B13B2E24100EA26FF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E930679913B2E22A00EA26FF /* Foundation.framework */; };
49  
-		E930679C13B2E24B00EA26FF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E930679913B2E22A00EA26FF /* Foundation.framework */; };
50 48
 		E93067E213B2E6D100EA26FF /* libExpecta-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E93067CE13B2E6D100EA26FF /* libExpecta-iOS.a */; };
51 49
 		E93067F513B2E7D900EA26FF /* ExpectationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E9ACDF7313B2DEB70010F4D7 /* ExpectationTest.m */; };
52 50
 		E93067F613B2E7DC00EA26FF /* NSValue+ExpectaTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E9ACDF7C13B2DEB70010F4D7 /* NSValue+ExpectaTest.m */; };
@@ -85,8 +83,6 @@
85 83
 		E930681813B2E85B00EA26FF /* EXPMatchers+toBeTruthy.m in Sources */ = {isa = PBXBuildFile; fileRef = E9ACDF5113B2DDC60010F4D7 /* EXPMatchers+toBeTruthy.m */; };
86 84
 		E930681913B2E85E00EA26FF /* EXPMatchers+toEqual.m in Sources */ = {isa = PBXBuildFile; fileRef = E9ACDF5313B2DDC60010F4D7 /* EXPMatchers+toEqual.m */; };
87 85
 		E930681A13B2E86000EA26FF /* EXPMatchers+toEqual.h in Headers */ = {isa = PBXBuildFile; fileRef = E9ACDF5213B2DDC60010F4D7 /* EXPMatchers+toEqual.h */; settings = {ATTRIBUTES = (Public, ); }; };
88  
-		E94296F113B42BF60038708B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E930679913B2E22A00EA26FF /* Foundation.framework */; };
89  
-		E94296F213B42BFA0038708B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E930679913B2E22A00EA26FF /* Foundation.framework */; };
90 86
 		E94296F413B42E160038708B /* EXPMatchers+toContainTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E94296F313B42E160038708B /* EXPMatchers+toContainTest.m */; };
91 87
 		E94296F513B42E160038708B /* EXPMatchers+toContainTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E94296F313B42E160038708B /* EXPMatchers+toContainTest.m */; };
92 88
 		E94296F813B430DF0038708B /* EXPMatchers+toContain.h in Headers */ = {isa = PBXBuildFile; fileRef = E94296F613B430DE0038708B /* EXPMatchers+toContain.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -147,6 +143,12 @@
147 143
 		E9ACDFA013B2E0BB0010F4D7 /* Fixtures.m in Sources */ = {isa = PBXBuildFile; fileRef = E9ACDF9C13B2E0BB0010F4D7 /* Fixtures.m */; };
148 144
 		E9AFC43A13C482D3006B4F2A /* AsynchronousTestingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AFC43913C482D3006B4F2A /* AsynchronousTestingTest.m */; };
149 145
 		E9AFC43B13C482D3006B4F2A /* AsynchronousTestingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AFC43913C482D3006B4F2A /* AsynchronousTestingTest.m */; };
  146
+		E9B777E714BA316200D8DC76 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E930679913B2E22A00EA26FF /* Foundation.framework */; };
  147
+		E9B777EA14BA317800D8DC76 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9B777E814BA316E00D8DC76 /* Foundation.framework */; };
  148
+		E9B777EC14BA31BE00D8DC76 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E930679913B2E22A00EA26FF /* Foundation.framework */; };
  149
+		E9B777EF14BA31D100D8DC76 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9B777ED14BA31C600D8DC76 /* SenTestingKit.framework */; };
  150
+		E9B777F014BA31DA00D8DC76 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9B777ED14BA31C600D8DC76 /* SenTestingKit.framework */; };
  151
+		E9B777F114BA31DE00D8DC76 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9B777E814BA316E00D8DC76 /* Foundation.framework */; };
150 152
 /* End PBXBuildFile section */
151 153
 
152 154
 /* Begin PBXContainerItemProxy section */
@@ -247,8 +249,9 @@
247 249
 		E9ACDF9C13B2E0BB0010F4D7 /* Fixtures.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Fixtures.m; sourceTree = "<group>"; };
248 250
 		E9ACDF9D13B2E0BB0010F4D7 /* TestHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestHelper.h; sourceTree = "<group>"; };
249 251
 		E9ACDFA213B2E0CC0010F4D7 /* Test-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Test-Info.plist"; sourceTree = "<group>"; };
250  
-		E9ACDFA313B2E0CC0010F4D7 /* Test-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Test-Prefix.pch"; sourceTree = "<group>"; };
251 252
 		E9AFC43913C482D3006B4F2A /* AsynchronousTestingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsynchronousTestingTest.m; sourceTree = "<group>"; };
  253
+		E9B777E814BA316E00D8DC76 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
  254
+		E9B777ED14BA31C600D8DC76 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
252 255
 /* End PBXFileReference section */
253 256
 
254 257
 /* Begin PBXFrameworksBuildPhase section */
@@ -256,7 +259,7 @@
256 259
 			isa = PBXFrameworksBuildPhase;
257 260
 			buildActionMask = 2147483647;
258 261
 			files = (
259  
-				E94296F113B42BF60038708B /* Foundation.framework in Frameworks */,
  262
+				E9B777EA14BA317800D8DC76 /* Foundation.framework in Frameworks */,
260 263
 			);
261 264
 			runOnlyForDeploymentPostprocessing = 0;
262 265
 		};
@@ -264,7 +267,8 @@
264 267
 			isa = PBXFrameworksBuildPhase;
265 268
 			buildActionMask = 2147483647;
266 269
 			files = (
267  
-				E94296F213B42BFA0038708B /* Foundation.framework in Frameworks */,
  270
+				E9B777F114BA31DE00D8DC76 /* Foundation.framework in Frameworks */,
  271
+				E9B777F014BA31DA00D8DC76 /* SenTestingKit.framework in Frameworks */,
268 272
 				E93067E213B2E6D100EA26FF /* libExpecta-iOS.a in Frameworks */,
269 273
 			);
270 274
 			runOnlyForDeploymentPostprocessing = 0;
@@ -273,7 +277,7 @@
273 277
 			isa = PBXFrameworksBuildPhase;
274 278
 			buildActionMask = 2147483647;
275 279
 			files = (
276  
-				E930679C13B2E24B00EA26FF /* Foundation.framework in Frameworks */,
  280
+				E9B777E714BA316200D8DC76 /* Foundation.framework in Frameworks */,
277 281
 			);
278 282
 			runOnlyForDeploymentPostprocessing = 0;
279 283
 		};
@@ -281,7 +285,8 @@
281 285
 			isa = PBXFrameworksBuildPhase;
282 286
 			buildActionMask = 2147483647;
283 287
 			files = (
284  
-				E930679B13B2E24100EA26FF /* Foundation.framework in Frameworks */,
  288
+				E9B777EC14BA31BE00D8DC76 /* Foundation.framework in Frameworks */,
  289
+				E9B777EF14BA31D100D8DC76 /* SenTestingKit.framework in Frameworks */,
285 290
 				E9ACDF2113B2DD520010F4D7 /* libExpecta.a in Frameworks */,
286 291
 			);
287 292
 			runOnlyForDeploymentPostprocessing = 0;
@@ -316,7 +321,9 @@
316 321
 		E9ACDF0E13B2DD520010F4D7 /* frameworks */ = {
317 322
 			isa = PBXGroup;
318 323
 			children = (
319  
-				E930679913B2E22A00EA26FF /* Foundation.framework */,
  324
+				E9B777E414BA314A00D8DC76 /* macosx */,
  325
+				E9B777E614BA315200D8DC76 /* ios */,
  326
+				E9B777ED14BA31C600D8DC76 /* SenTestingKit.framework */,
320 327
 			);
321 328
 			name = frameworks;
322 329
 			sourceTree = "<group>";
@@ -436,11 +443,26 @@
436 443
 			isa = PBXGroup;
437 444
 			children = (
438 445
 				E9ACDFA213B2E0CC0010F4D7 /* Test-Info.plist */,
439  
-				E9ACDFA313B2E0CC0010F4D7 /* Test-Prefix.pch */,
440 446
 			);
441 447
 			path = support;
442 448
 			sourceTree = "<group>";
443 449
 		};
  450
+		E9B777E414BA314A00D8DC76 /* macosx */ = {
  451
+			isa = PBXGroup;
  452
+			children = (
  453
+				E930679913B2E22A00EA26FF /* Foundation.framework */,
  454
+			);
  455
+			name = macosx;
  456
+			sourceTree = "<group>";
  457
+		};
  458
+		E9B777E614BA315200D8DC76 /* ios */ = {
  459
+			isa = PBXGroup;
  460
+			children = (
  461
+				E9B777E814BA316E00D8DC76 /* Foundation.framework */,
  462
+			);
  463
+			name = ios;
  464
+			sourceTree = "<group>";
  465
+		};
444 466
 /* End PBXGroup section */
445 467
 
446 468
 /* Begin PBXHeadersBuildPhase section */
@@ -467,9 +489,9 @@
467 489
 				E9685DBD13B5E39300ADF2D7 /* ExpectaSupport.h in Headers */,
468 490
 				61740D8B14256B2500091DDF /* EXPMatchers+toBeInTheRangeOf.h in Headers */,
469 491
 				AE0E76FF13FF3840009AF5D8 /* EXPMatchers+toBeLessThan.h in Headers */,
  492
+				AEBA779B14055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.h in Headers */,
470 493
 				E1EB1BC413BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */,
471 494
 				E1EB1BC813BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */,
472  
-				AEBA779B14055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.h in Headers */,
473 495
 				4913B4CD1411E18A00040ECB /* EXPMatchers+toBeGreaterThan.h in Headers */,
474 496
 				4913B4D61411E45800040ECB /* EXPMatchers+toBeGreaterThanOrEqualTo.h in Headers */,
475 497
 			);
@@ -498,11 +520,11 @@
498 520
 				E9685DBC13B5E39300ADF2D7 /* ExpectaSupport.h in Headers */,
499 521
 				61740D8A14256B2500091DDF /* EXPMatchers+toBeInTheRangeOf.h in Headers */,
500 522
 				AE0E76F813FF3732009AF5D8 /* EXPMatchers+toBeLessThan.h in Headers */,
501  
-				E1EB1BC313BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */,
502  
-				E1EB1BC713BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */,
503 523
 				AEBA779A14055E9D001690B6 /* EXPMatchers+toBeLessThanOrEqualTo.h in Headers */,
504 524
 				4913B4CC1411E18A00040ECB /* EXPMatchers+toBeGreaterThan.h in Headers */,
505 525
 				4913B4D51411E45800040ECB /* EXPMatchers+toBeGreaterThanOrEqualTo.h in Headers */,
  526
+				E1EB1BC313BEA1BE00E4C93B /* EXPDoubleTuple.h in Headers */,
  527
+				E1EB1BC713BEA1BE00E4C93B /* EXPFloatTuple.h in Headers */,
506 528
 			);
507 529
 			runOnlyForDeploymentPostprocessing = 0;
508 530
 		};
@@ -588,6 +610,7 @@
588 610
 			isa = PBXProject;
589 611
 			attributes = {
590 612
 				LastUpgradeCheck = 0420;
  613
+				ORGANIZATIONNAME = "Peter Jihoon Kim";
591 614
 			};
592 615
 			buildConfigurationList = E9ACDF0613B2DD520010F4D7 /* Build configuration list for PBXProject "Expecta" */;
593 616
 			compatibilityVersion = "Xcode 3.2";
@@ -832,7 +855,7 @@
832 855
 					"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
833 856
 				);
834 857
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
835  
-				GCC_PREFIX_HEADER = "test/support/Test-Prefix.pch";
  858
+				GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
836 859
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
837 860
 				INFOPLIST_FILE = "test/support/Test-Info.plist";
838 861
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
@@ -858,7 +881,7 @@
858 881
 					"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
859 882
 				);
860 883
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
861  
-				GCC_PREFIX_HEADER = "test/support/Test-Prefix.pch";
  884
+				GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
862 885
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
863 886
 				INFOPLIST_FILE = "test/support/Test-Info.plist";
864 887
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
@@ -878,6 +901,7 @@
878 901
 			isa = XCBuildConfiguration;
879 902
 			buildSettings = {
880 903
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
  904
+				COPY_PHASE_STRIP = NO;
881 905
 				GCC_C_LANGUAGE_STANDARD = gnu99;
882 906
 				GCC_OPTIMIZATION_LEVEL = 0;
883 907
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
@@ -910,7 +934,6 @@
910 934
 			isa = XCBuildConfiguration;
911 935
 			buildSettings = {
912 936
 				ALWAYS_SEARCH_USER_PATHS = NO;
913  
-				COPY_PHASE_STRIP = NO;
914 937
 				GCC_DYNAMIC_NO_PIC = NO;
915 938
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
916 939
 				GCC_ENABLE_OBJC_GC = supported;
@@ -927,7 +950,6 @@
927 950
 			isa = XCBuildConfiguration;
928 951
 			buildSettings = {
929 952
 				ALWAYS_SEARCH_USER_PATHS = NO;
930  
-				COPY_PHASE_STRIP = YES;
931 953
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
932 954
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
933 955
 				GCC_ENABLE_OBJC_GC = supported;
@@ -944,12 +966,11 @@
944 966
 			isa = XCBuildConfiguration;
945 967
 			buildSettings = {
946 968
 				ALWAYS_SEARCH_USER_PATHS = NO;
947  
-				COPY_PHASE_STRIP = NO;
948 969
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
949 970
 				GCC_DYNAMIC_NO_PIC = NO;
950 971
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
951 972
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
952  
-				GCC_PREFIX_HEADER = "test/support/Test-Prefix.pch";
  973
+				GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
953 974
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
954 975
 				INFOPLIST_FILE = "test/support/Test-Info.plist";
955 976
 				OTHER_LDFLAGS = (
@@ -966,12 +987,11 @@
966 987
 			isa = XCBuildConfiguration;
967 988
 			buildSettings = {
968 989
 				ALWAYS_SEARCH_USER_PATHS = NO;
969  
-				COPY_PHASE_STRIP = YES;
970 990
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
971 991
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
972 992
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
973 993
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
974  
-				GCC_PREFIX_HEADER = "test/support/Test-Prefix.pch";
  994
+				GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
975 995
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
976 996
 				INFOPLIST_FILE = "test/support/Test-Info.plist";
977 997
 				OTHER_LDFLAGS = (
5  README.md
Source Rendered
@@ -43,7 +43,7 @@ expect(baz).toEqual(3.14159);
43 43
 
44 44
 If `EXP_SHORTHAND` is not defined, expectations must be written with `EXP_expect` instead of `expect`.
45 45
 
46  
-Expecta works with OCUnit (SenTestingKit), [Cedar BDD Framework](http://pivotal.github.com/cedar/) and any other OCUnit-compatible test framework.
  46
+Expecta is framework-agnostic. It works well with OCUnit (SenTestingKit) and OCUnit-compatible test frameworks such as [Specta](http://github.com/petejkim/specta/), [GHUnit](http://github.com/gabriel/gh-unit/) and [GTMUnit](http://code.google.com/p/google-toolbox-for-mac/). Expecta also supports [Cedar](http://pivotal.github.com/cedar/).
47 47
 
48 48
 ## BUILT-IN MATCHERS
49 49
 
@@ -169,4 +169,5 @@ You can find the public Tracker project [here](https://www.pivotaltracker.com/pr
169 169
 
170 170
 ## LICENSE
171 171
 
172  
-Copyright (c) 2011 Peter Jihoon Kim. This software is licensed under the MIT License.
  172
+Copyright (c) 2011 Peter Jihoon Kim. This software is licensed under the [MIT License](http://github.com/petejkim/expecta/raw/master/LICENSE).
  173
+
4  Rakefile
@@ -24,8 +24,8 @@ task :build => :clean do |t|
24 24
   execute xcodebuild('Expecta-iOS', 'iphonesimulator', configuration)
25 25
   execute xcodebuild('Expecta-iOS', 'iphoneos', configuration)
26 26
   macosx_binary = "build/#{configuration}/libExpecta.a"
27  
-  iphoneos_binary = "build/#{configuration}-iphonesimulator/libExpecta-ios.a"
28  
-  iphonesimulator_binary = "build/#{configuration}-iphoneos/libExpecta-ios.a"
  27
+  iphoneos_binary = "build/#{configuration}-iphoneos/libExpecta-ios.a"
  28
+  iphonesimulator_binary = "build/#{configuration}-iphonesimulator/libExpecta-ios.a"
29 29
   universal_binary = "build/libExpecta-ios-universal.a"
30 30
   puts "=== GENERATE UNIVERSAL iOS BINARY (Device/Simulator) ==="
31 31
   execute "lipo -create '#{iphoneos_binary}' '#{iphonesimulator_binary}' -output '#{universal_binary}'"
2  src/ExpectaSupport.h
@@ -27,7 +27,7 @@ EXPFixCategoriesBug(EXPMatcher##matcherName##Matcher); \
27 27
 @implementation EXPExpect (matcherName##Matcher) \
28 28
 @dynamic matcherName;\
29 29
 - (void(^) matcherArguments) matcherName { \
30  
-  [[[NSThread currentThread] threadDictionary] setObject:self forKey:@"currentMatcher"]; \
  30
+  [[[NSThread currentThread] threadDictionary] setObject:self forKey:@"EXP_currentMatcher"]; \
31 31
   __block id actual = self.actual; \
32 32
   __block void (^prerequisite)(EXPBoolBlock block) = ^(EXPBoolBlock block) { EXP_prerequisite(block); }; \
33 33
   __block void (^match)(EXPBoolBlock block) = ^(EXPBoolBlock block) { EXP_match(block); }; \
8  src/ExpectaSupport.m
@@ -145,18 +145,18 @@ void EXPFail(id testCase, int lineNumber, char *fileName, NSString *message) {
145 145
 }
146 146
 
147 147
 void EXP_prerequisite(EXPBoolBlock block) {
148  
-  [[[[NSThread currentThread] threadDictionary] objectForKey:@"currentMatcher"] setPrerequisiteBlock:block];
  148
+  [[[[NSThread currentThread] threadDictionary] objectForKey:@"EXP_currentMatcher"] setPrerequisiteBlock:block];
149 149
 }
150 150
 
151 151
 void EXP_match(EXPBoolBlock block) {
152  
-  [[[[NSThread currentThread] threadDictionary] objectForKey:@"currentMatcher"] setMatchBlock:block];
  152
+  [[[[NSThread currentThread] threadDictionary] objectForKey:@"EXP_currentMatcher"] setMatchBlock:block];
153 153
 }
154 154
 
155 155
 void EXP_failureMessageForTo(EXPStringBlock block) {
156  
-  [[[[NSThread currentThread] threadDictionary] objectForKey:@"currentMatcher"] setFailureMessageForToBlock:block];
  156
+  [[[[NSThread currentThread] threadDictionary] objectForKey:@"EXP_currentMatcher"] setFailureMessageForToBlock:block];
157 157
 }
158 158
 
159 159
 void EXP_failureMessageForNotTo(EXPStringBlock block) {
160  
-  [[[[NSThread currentThread] threadDictionary] objectForKey:@"currentMatcher"] setFailureMessageForNotToBlock:block];
  160
+  [[[[NSThread currentThread] threadDictionary] objectForKey:@"EXP_currentMatcher"] setFailureMessageForNotToBlock:block];
161 161
 }
162 162
 
3  test/support/Test-Prefix.pch
... ...
@@ -1,3 +0,0 @@
1  
-#ifdef __OBJC__
2  
-#  import <Foundation/Foundation.h>
3  
-#endif

0 notes on commit 49056ca

Please sign in to comment.
Something went wrong with that request. Please try again.