Permalink
Browse files

Removing prefix header; Adding in xml additions

  • Loading branch information...
1 parent 3d18156 commit 73cbae554a845c46b1d2b2c99b2ab569cb6eea1a @gabriel gabriel committed Jul 6, 2011
@@ -6,6 +6,7 @@
// Copyright 2009. All rights reserved.
//
+#import <Cocoa/Cocoa.h>
#import "GHTestViewModel.h"
@class GHTestOutlineViewModel;
@@ -29,6 +29,8 @@
//! @cond DEV
+#import <Foundation/Foundation.h>
+
/*!
Category for overriding the current locale at runtime.
@@ -29,6 +29,9 @@
//! @cond DEV
+#import <Foundation/Foundation.h>
+
+
/*!
Test status.
*/
@@ -82,6 +82,8 @@
@brief Assert macros for testing.
*/
+#import <Foundation/Foundation.h>
+
#import "NSException+GHTestFailureExceptions.h"
#import "NSValue+GHValueFormatter.h"
@@ -6,6 +6,7 @@
// Copyright 2009. All rights reserved.
//
+#import <Cocoa/Cocoa.h>
#import "GHTestViewModel.h"
@class GHTestOutlineViewModel;
@@ -30,6 +30,8 @@
//! @cond DEV
#import "GHTestGroup.h"
+#import "GHTestSuite.h"
+#import "GHTestRunner.h"
@class GHTestNode;
@@ -48,6 +48,9 @@
// the License.
//
+#import <Foundation/Foundation.h>
+#import "GHUnit.h"
+
#ifdef __cplusplus
extern "C" NSString *GHUStackTraceFromException(NSException *e);
#else
@@ -114,7 +114,7 @@ fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@
- In the "Tests" target, Build Settings, under 'Framework Search Paths' make sure the (parent) directory to GHUnitIOS.framework is listed.
- In the "Tests" target, Build Settigns, under 'Other Linker Flags' in the "Tests" target, add <tt>-ObjC</tt> and <tt>-all_load</tt>
- By default, the Tests-Info.plist file includes <tt>MainWindow_iPhone</tt> and <tt>MainWindow_iPad</tt> for <tt>Main nib file base name</tt>. You should remove both these fields.
- - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-IPhone/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target. You should delete the existing main.m file (or replace the contents of the existing main.m with GHUnitIOSTestMain.m).
+ - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-iOS/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target. You should delete the existing main.m file (or replace the contents of the existing main.m with GHUnitIOSTestMain.m).
- @ref Examples "Create a test"
- Build and run the "Tests" target.
- You can remove the files: TestsAppDelete* and MainWindow* that were generated with the Tests target.
@@ -132,7 +132,7 @@ fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@
- In Build Settings, under 'Framework Search Paths' make sure the (parent) directory to GHUnitIOS.framework is listed.
- In Build Settings, under 'Other Linker Flags' in the <tt>Tests</tt> target, add <tt>-ObjC</tt> and <tt>-all_load</tt>
- By default, the Tests-Info.plist file includes <tt>MainWindow</tt> for <tt>Main nib file base name</tt>. You should clear this field.
- - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-IPhone/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target.
+ - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-iOS/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target.
- (Optional) Create and and set a prefix header (<tt>Tests_Prefix.pch</tt>) and add <tt>#import <GHUnitIOS/GHUnit.h></tt> to it, and then you won't have to include that import for every test.
- @ref Examples "Create a test"
- Build and run the "Tests" target.
@@ -199,7 +199,7 @@ fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@
/*!
@page Building Building
- For iOS, run <tt>make</tt> from within the <tt>Project-IPhone</tt> directory. The framework is in <tt>Project-IPhone/build/Framework/</tt>.
+ For iOS, run <tt>make</tt> from within the <tt>Project-iOS</tt> directory. The framework is in <tt>Project-iOS/build/Framework/</tt>.
For Mac OS X, the framework build is stored in <tt>Project/build/Release/</tt>.
*/
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>10J4138</string>
+ <string>10K540</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>0.4.29</string>
+ <string>0.4.30</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
@@ -9,6 +9,9 @@
/* Begin PBXBuildFile section */
00271A3813C28D1F00B06B98 /* GHUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0083D08613BCFDDB00F71F21 /* GHUnit.framework */; };
00271A3913C294F800B06B98 /* GHUnitTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 0083D0DC13BCFE1700F71F21 /* GHUnitTestMain.m */; };
+ 004E186E13C518C1007D842B /* GTMGarbageCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 004E186B13C518C1007D842B /* GTMGarbageCollection.h */; };
+ 004E186F13C518C1007D842B /* GTMNSString+XML.h in Headers */ = {isa = PBXBuildFile; fileRef = 004E186C13C518C1007D842B /* GTMNSString+XML.h */; };
+ 004E187013C518C1007D842B /* GTMNSString+XML.m in Sources */ = {isa = PBXBuildFile; fileRef = 004E186D13C518C1007D842B /* GTMNSString+XML.m */; };
0083D08A13BCFDDB00F71F21 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0083D08913BCFDDB00F71F21 /* Cocoa.framework */; };
0083D09413BCFDDB00F71F21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0083D09213BCFDDB00F71F21 /* InfoPlist.strings */; };
0083D0EA13BCFE1700F71F21 /* GHAsyncTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0083D0B413BCFE1700F71F21 /* GHAsyncTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -120,14 +123,16 @@
/* Begin PBXFileReference section */
00271A3A13C2965200B06B98 /* RunTests.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = RunTests.sh; path = ../../Scripts/RunTests.sh; sourceTree = "<group>"; };
+ 004E186B13C518C1007D842B /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMGarbageCollection.h; sourceTree = "<group>"; };
+ 004E186C13C518C1007D842B /* GTMNSString+XML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+XML.h"; sourceTree = "<group>"; };
+ 004E186D13C518C1007D842B /* GTMNSString+XML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+XML.m"; sourceTree = "<group>"; };
0083D08613BCFDDB00F71F21 /* GHUnit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GHUnit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0083D08913BCFDDB00F71F21 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
0083D08C13BCFDDB00F71F21 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
0083D08D13BCFDDB00F71F21 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
0083D08E13BCFDDB00F71F21 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
0083D09113BCFDDB00F71F21 /* GHUnitMacOSX-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GHUnitMacOSX-Info.plist"; sourceTree = "<group>"; };
0083D09313BCFDDB00F71F21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
- 0083D09513BCFDDB00F71F21 /* GHUnitMacOSX-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GHUnitMacOSX-Prefix.pch"; sourceTree = "<group>"; };
0083D0B413BCFE1700F71F21 /* GHAsyncTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHAsyncTestCase.h; sourceTree = "<group>"; };
0083D0B513BCFE1700F71F21 /* GHAsyncTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHAsyncTestCase.m; sourceTree = "<group>"; };
0083D0B713BCFE1700F71F21 /* GHTest+JUnitXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHTest+JUnitXML.h"; sourceTree = "<group>"; };
@@ -299,7 +304,6 @@
0083D19513C28B8700F71F21 /* GTM */,
0083D09113BCFDDB00F71F21 /* GHUnitMacOSX-Info.plist */,
0083D09213BCFDDB00F71F21 /* InfoPlist.strings */,
- 0083D09513BCFDDB00F71F21 /* GHUnitMacOSX-Prefix.pch */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -503,6 +507,9 @@
0083D19613C28B8700F71F21 /* Foundation */ = {
isa = PBXGroup;
children = (
+ 004E186B13C518C1007D842B /* GTMGarbageCollection.h */,
+ 004E186C13C518C1007D842B /* GTMNSString+XML.h */,
+ 004E186D13C518C1007D842B /* GTMNSString+XML.m */,
0083D19713C28B8700F71F21 /* GTMObjC2Runtime.h */,
0083D19813C28B8700F71F21 /* GTMObjC2Runtime.m */,
0083D19913C28B8700F71F21 /* GTMStackTrace.h */,
@@ -547,6 +554,8 @@
0083D1A213C28B8700F71F21 /* GTMObjC2Runtime.h in Headers */,
0083D1A413C28B8700F71F21 /* GTMStackTrace.h in Headers */,
0083D1A613C28B8700F71F21 /* GTMDefines.h in Headers */,
+ 004E186E13C518C1007D842B /* GTMGarbageCollection.h in Headers */,
+ 004E186F13C518C1007D842B /* GTMNSString+XML.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -685,6 +694,7 @@
0083D1A113C28B8700F71F21 /* GHNSObject+Invocation.m in Sources */,
0083D1A313C28B8700F71F21 /* GTMObjC2Runtime.m in Sources */,
0083D1A513C28B8700F71F21 /* GTMStackTrace.m in Sources */,
+ 004E187013C518C1007D842B /* GTMNSString+XML.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -782,8 +792,6 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "GHUnitMacOSX/GHUnitMacOSX-Prefix.pch";
INFOPLIST_FILE = "GHUnitMacOSX/GHUnitMacOSX-Info.plist";
PRODUCT_NAME = GHUnit;
WRAPPER_EXTENSION = framework;
@@ -797,8 +805,6 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "GHUnitMacOSX/GHUnitMacOSX-Prefix.pch";
INFOPLIST_FILE = "GHUnitMacOSX/GHUnitMacOSX-Info.plist";
PRODUCT_NAME = GHUnit;
WRAPPER_EXTENSION = framework;
@@ -1,14 +0,0 @@
-//
-// Prefix header for all source files of the 'GHUnitMacOSX' target in the 'GHUnitMacOSX' project
-//
-
-#ifdef __OBJC__
- #import <Cocoa/Cocoa.h>
-
- // GHKit Dependencies
- #import "GHNSInvocation+Utils.h"
- #import "GHNSObject+Invocation.h"
-
- #import "GHUnit.h"
-
-#endif
@@ -11,5 +11,3 @@ INFOPLIST_FILE = Info.plist
PRODUCT_NAME = GHUnit
WRAPPER_EXTENSION = framework
GCC_ENABLE_OBJC_GC = supported
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-GCC_PREFIX_HEADER = GHUnit_Prefix.pch

0 comments on commit 73cbae5

Please sign in to comment.