Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Various changes to clean out cruft and get rid of annoying behaviour:

* GHUnit is no longer included as a git submodule. Instead, build scripts are used to fetch a pre-compiled GHUnit framework if one does not exist in External/GHUnit.
* iPhone sample has moved to using the framework rather than the static library for GHUnit
* Fiddle with conditional compilation for NSXMLParserDelegate
* Tweak the build phases to move running the scripts earlier
* Fix a clang warning that crept in as part of the recent changes to behaviour for fetching PAC files
* Remove legacy clang.sh script
* Move build scripts into their own folder
  • Loading branch information...
commit bf03acff85fd215cb8ebe84cbb544f91f6012cb2 1 parent 0309737
@pokeb authored
View
1  .gitignore
@@ -9,3 +9,4 @@ build
profile
*.pbxuser
*.mode1v3
+External/GHUnit/*
View
3  .gitmodules
@@ -1,3 +0,0 @@
-[submodule "External/GHUnit"]
- path = External/GHUnit
- url = git://github.com/gabriel/gh-unit.git
View
14 Build Scripts/fetch_ios_ghunit.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+# This script fetches a pre-compiled copy of the iOS GHUnit.framework, if one isn't already in the External/GHUnit folder
+# This replaces the old system, where GHUnit was included as a git submodule, because:
+# a) git submodules confuse people (including me)
+# b) GHUnit seems to be tricky to build without warnings
+# The pre-compiled frameworks on allseeing-i.com were taken directly from those on the GHUnit downloads page on GitHub
+# If you'd rather build GHUnit yourself, simply grab a copy from http://github.com/gabriel/gh-unit and drop your built framework into External/GHUnit
+
+require 'net/http'
+if (!File.exists?('External/GHUnit/GHUnitIOS.framework'))
+ `curl -s http://allseeing-i.com/ASIHTTPRequest/GHUnit/GHUnit-IOS.zip > External/GHUnit/GHUnit-IOS.zip`
+ `unzip External/GHUnit/GHUnit-IOS.zip -d External/GHUnit/ & rm External/GHUnit/GHUnit-IOS.zip`
+end
View
14 Build Scripts/fetch_mac_ghunit.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+# This script fetches a pre-compiled copy of the Mac GHUnit.framework, if one isn't already in the External/GHUnit folder
+# This replaces the old system, where GHUnit was included as a git submodule, because:
+# a) git submodules confuse people (including me)
+# b) GHUnit seems to be tricky to build without warnings
+# The pre-compiled frameworks on allseeing-i.com were taken directly from those on the GHUnit downloads page on GitHub
+# If you'd rather build GHUnit yourself, simply grab a copy from http://github.com/gabriel/gh-unit and drop your built framework into External/GHUnit
+
+require 'net/http'
+if (!File.exists?('External/GHUnit/GHUnit.framework'))
+ `curl -s http://allseeing-i.com/ASIHTTPRequest/GHUnit/GHUnit-Mac.zip > External/GHUnit/GHUnit-Mac.zip`
+ `unzip External/GHUnit/GHUnit-Mac.zip -d External/GHUnit/ & rm External/GHUnit/GHUnit-Mac.zip`
+end
View
0  set_version_number.rb → Build Scripts/set_version_number.rb
File renamed without changes
View
4 Classes/ASIHTTPRequest.m
@@ -24,7 +24,7 @@
#import "ASIDataCompressor.h"
// Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.8-49 2011-02-05";
+NSString *ASIHTTPRequestVersion = @"v1.8-50 2011-02-05";
NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
@@ -3684,7 +3684,7 @@ - (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode
}
// If your PAC file is larger than 16KB, you're just being cruel.
uint8_t buf[16384];
- unsigned int len = [(NSInputStream *)stream read:buf maxLength:16384];
+ NSInteger len = [(NSInputStream *)stream read:buf maxLength:16384];
if (len) {
[[self PACFileData] appendBytes:(const void *)buf length:len];
}
View
2  Classes/S3/ASINSXMLParserCompat.h
@@ -8,7 +8,7 @@
//
-#if !TARGET_OS_IPHONE || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED <= __IPHONE_4_0)
+#if (!TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_6) || (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED <= __IPHONE_4_0)
@protocol NSXMLParserDelegate
@optional
View
2  Classes/Tests/ASITestCase.h
@@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#if TARGET_OS_IPHONE
-#import "GHUnit.h"
+#import <GHUnitIOS/GHUnit.h>
#else
#import <GHUnit/GHUnit.h>
#endif
1  External/GHUnit
@@ -1 +0,0 @@
-Subproject commit ffb51729219514fb7948b9be29bbae3dfabb1f4a
View
101 Mac.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
B502441B1025D36B002B13E1 /* ProxyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B502441A1025D36B002B13E1 /* ProxyTests.m */; };
B50C17DB121C254D0055FCAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50C17DA121C254D0055FCAB /* Security.framework */; };
- B50FDEAA115A325E00BBC736 /* GHUnit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B5DB497C115624BF0062DB57 /* GHUnit.framework */; };
B51A1A9511DDF84700ED75CF /* ASIDownloadCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B51A1A9411DDF84700ED75CF /* ASIDownloadCacheTests.m */; };
B522D71F103074AC009A2D22 /* ASIInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = B522D71E103074AC009A2D22 /* ASIInputStream.m */; };
B522D720103074AC009A2D22 /* ASIInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = B522D71E103074AC009A2D22 /* ASIInputStream.m */; };
@@ -61,34 +60,10 @@
B5873FA410FF2890001E145F /* ASICloudFilesRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B5873F9D10FF2890001E145F /* ASICloudFilesRequest.m */; };
B587400810FF2913001E145F /* ASICloudFilesRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B587400610FF2913001E145F /* ASICloudFilesRequestTests.m */; };
B5B513860FBEE515002C74D0 /* GHUnitTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = B5B513850FBEE515002C74D0 /* GHUnitTestMain.m */; };
+ B5BF64E612FDE9CA00CBC324 /* GHUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BF64E512FDE9C900CBC324 /* GHUnit.framework */; };
B5C664BC100A6220004F3C96 /* ASIS3RequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5C664BB100A6220004F3C96 /* ASIS3RequestTests.m */; };
- B5DB49CA115627300062DB57 /* GHUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5DB497C115624BF0062DB57 /* GHUnit.framework */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- B5DB497B115624BF0062DB57 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = B5DB4976115624BF0062DB57 /* GHUnit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
- remoteInfo = GHUnit;
- };
- B5DB497D115624BF0062DB57 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = B5DB4976115624BF0062DB57 /* GHUnit.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 002E73B60F2C213700427636;
- remoteInfo = Tests;
- };
- B5DB4981115624C60062DB57 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = B5DB4976115624BF0062DB57 /* GHUnit.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- remoteInfo = GHUnit;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXCopyFilesBuildPhase section */
B5B513820FBEE477002C74D0 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -96,7 +71,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
- B50FDEAA115A325E00BBC736 /* GHUnit.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -195,9 +169,9 @@
B587400710FF2913001E145F /* ASICloudFilesRequestTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASICloudFilesRequestTests.h; sourceTree = "<group>"; };
B5B513850FBEE515002C74D0 /* GHUnitTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHUnitTestMain.m; sourceTree = "<group>"; };
B5BD2BE611CA5EBC00D7C426 /* ASINSXMLParserCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASINSXMLParserCompat.h; path = Classes/S3/ASINSXMLParserCompat.h; sourceTree = SOURCE_ROOT; };
+ B5BF64E512FDE9C900CBC324 /* GHUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GHUnit.framework; path = External/GHUnit/GHUnit.framework; sourceTree = "<group>"; };
B5C664BA100A6220004F3C96 /* ASIS3RequestTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIS3RequestTests.h; sourceTree = "<group>"; };
B5C664BB100A6220004F3C96 /* ASIS3RequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIS3RequestTests.m; sourceTree = "<group>"; };
- B5DB4976115624BF0062DB57 /* GHUnit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GHUnit.xcodeproj; path = External/GHUnit/Project/GHUnit.xcodeproj; sourceTree = "<group>"; };
B5E3858B0F76606B00FD7857 /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "Mac Sample/Tests-Info.plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -218,11 +192,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- B5DB49CA115627300062DB57 /* GHUnit.framework in Frameworks */,
B55B60140F7659A30064029C /* libz.1.2.3.dylib in Frameworks */,
B522DE601031BB03009A2D22 /* SystemConfiguration.framework in Frameworks */,
B50C17DB121C254D0055FCAB /* Security.framework in Frameworks */,
B53E62DC1255F6FC00C1E79A /* libxml2.dylib in Frameworks */,
+ B5BF64E612FDE9CA00CBC324 /* GHUnit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -232,8 +206,8 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
- B5DB4976115624BF0062DB57 /* GHUnit.xcodeproj */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+ B5BF64E512FDE9C900CBC324 /* GHUnit.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
@@ -420,15 +394,6 @@
path = CloudFiles;
sourceTree = "<group>";
};
- B5DB4977115624BF0062DB57 /* Products */ = {
- isa = PBXGroup;
- children = (
- B5DB497C115624BF0062DB57 /* GHUnit.framework */,
- B5DB497E115624BF0062DB57 /* Tests.app */,
- );
- name = Products;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -436,10 +401,10 @@
isa = PBXNativeTarget;
buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Mac" */;
buildPhases = (
+ B52D48FA10DA3FF4008E8365 /* ShellScript */,
8D1107290486CEB800E47090 /* Resources */,
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
- B52D48FA10DA3FF4008E8365 /* ShellScript */,
);
buildRules = (
);
@@ -455,16 +420,15 @@
isa = PBXNativeTarget;
buildConfigurationList = B55B5EE40F7658C80064029C /* Build configuration list for PBXNativeTarget "Unit Tests (GHUnit)" */;
buildPhases = (
+ B52D490910DA4009008E8365 /* ShellScript */,
B55B5EDB0F7658C70064029C /* Resources */,
B55B5EDC0F7658C70064029C /* Sources */,
B55B5EDD0F7658C70064029C /* Frameworks */,
B5B513820FBEE477002C74D0 /* CopyFiles */,
- B52D490910DA4009008E8365 /* ShellScript */,
);
buildRules = (
);
dependencies = (
- B5DB4982115624C60062DB57 /* PBXTargetDependency */,
);
name = "Unit Tests (GHUnit)";
productName = "Unit Tests (GHUnit)";
@@ -488,12 +452,6 @@
);
mainGroup = 29B97314FDCFA39411CA2CEA /* Mac */;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = B5DB4977115624BF0062DB57 /* Products */;
- ProjectRef = B5DB4976115624BF0062DB57 /* GHUnit.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
8D1107260486CEB800E47090 /* Mac */,
@@ -502,23 +460,6 @@
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- B5DB497C115624BF0062DB57 /* GHUnit.framework */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.framework;
- path = GHUnit.framework;
- remoteRef = B5DB497B115624BF0062DB57 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- B5DB497E115624BF0062DB57 /* Tests.app */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.application;
- path = Tests.app;
- remoteRef = B5DB497D115624BF0062DB57 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
8D1107290486CEB800E47090 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -549,7 +490,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = ./set_version_number.rb;
+ shellScript = "./Build\\ Scripts/set_version_number.rb";
};
B52D490910DA4009008E8365 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -562,7 +503,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = ./set_version_number.rb;
+ shellScript = "./Build\\ Scripts/set_version_number.rb\n./Build\\ Scripts/fetch_mac_ghunit.rb";
};
/* End PBXShellScriptBuildPhase section */
@@ -627,14 +568,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- B5DB4982115624C60062DB57 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = GHUnit;
- targetProxy = B5DB4981115624C60062DB57 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
B55B5E730F7656DA0064029C /* MainMenu.xib */ = {
isa = PBXVariantGroup;
@@ -662,7 +595,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = "External/GHUnit/**";
+ FRAMEWORK_SEARCH_PATHS = (
+ "External/GHUnit/**",
+ "\"$(SRCROOT)/External/GHUnit\"",
+ );
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -685,7 +621,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = "Unit Tests (GHUnit)";
- SDKROOT = macosx10.5;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -697,7 +633,10 @@
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FRAMEWORK_SEARCH_PATHS = "External/GHUnit/**";
+ FRAMEWORK_SEARCH_PATHS = (
+ "External/GHUnit/**",
+ "\"$(SRCROOT)/External/GHUnit\"",
+ );
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
@@ -716,7 +655,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = "Unit Tests (GHUnit)";
- SDKROOT = macosx10.5;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@@ -742,7 +681,7 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = Mac;
- SDKROOT = macosx10.5;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -763,7 +702,7 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = Mac;
- SDKROOT = macosx10.5;
+ SDKROOT = macosx;
};
name = Release;
};
View
3  clang.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-scan-build xcodebuild -target iPhone -configuration Debug -project iPhone.xcodeproj -sdk iphonesimulator2.2.1
-scan-build xcodebuild -target Mac -configuration Debug -project Mac.xcodeproj
View
82 iPhone Sample/GHUnitIOSTestMain.m
@@ -0,0 +1,82 @@
+//
+// GHUnitIOSTestMain.m
+// GHUnitIPhone
+//
+// Created by Gabriel Handford on 1/25/09.
+// Copyright 2009. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#import <UIKit/UIKit.h>
+
+// If you are using the framework
+#import <GHUnitIOS/GHUnit.h>
+// If you are using the static library and importing header files manually
+//#import "GHUnit.h"
+
+// Default exception handler
+void exceptionHandler(NSException *exception) {
+ NSLog(@"%@\n%@", [exception reason], GHUStackTraceFromException(exception));
+}
+
+int main(int argc, char *argv[]) {
+
+ /*!
+ For debugging:
+ Go into the "Get Info" contextual menu of your (test) executable (inside the "Executables" group in the left panel of XCode).
+ Then go in the "Arguments" tab. You can add the following environment variables:
+
+ Default: Set to:
+ NSDebugEnabled NO "YES"
+ NSZombieEnabled NO "YES"
+ NSDeallocateZombies NO "YES"
+ NSHangOnUncaughtException NO "YES"
+
+ NSEnableAutoreleasePool YES "NO"
+ NSAutoreleaseFreedObjectCheckEnabled NO "YES"
+ NSAutoreleaseHighWaterMark 0 non-negative integer
+ NSAutoreleaseHighWaterResolution 0 non-negative integer
+
+ For info on these varaiables see NSDebug.h; http://theshadow.uw.hu/iPhoneSDKdoc/Foundation.framework/NSDebug.h.html
+
+ For malloc debugging see: http://developer.apple.com/mac/library/documentation/Performance/Conceptual/ManagingMemory/Articles/MallocDebug.html
+ */
+
+ NSSetUncaughtExceptionHandler(&exceptionHandler);
+
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+ // Register any special test case classes
+ //[[GHTesting sharedInstance] registerClassName:@"GHSpecialTestCase"];
+
+ int retVal = 0;
+ // If GHUNIT_CLI is set we are using the command line interface and run the tests
+ // Otherwise load the GUI app
+ if (getenv("GHUNIT_CLI")) {
+ retVal = [GHTestRunner run];
+ } else {
+ retVal = UIApplicationMain(argc, argv, nil, @"GHUnitIPhoneAppDelegate");
+ }
+ [pool release];
+ return retVal;
+}
View
102 iPhone.xcodeproj/project.pbxproj
@@ -33,8 +33,6 @@
B540400C115114BA00D8BE63 /* ASIS3BucketRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B5404002115114BA00D8BE63 /* ASIS3BucketRequest.m */; };
B540400D115114BA00D8BE63 /* ASIS3ObjectRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B5404004115114BA00D8BE63 /* ASIS3ObjectRequest.m */; };
B540400E115114BA00D8BE63 /* ASIS3ServiceRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B5404006115114BA00D8BE63 /* ASIS3ServiceRequest.m */; };
- B54043B11151542C00D8BE63 /* GHUnitIPhoneTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = B54043AB1151542C00D8BE63 /* GHUnitIPhoneTestMain.m */; };
- B54043BB1151546F00D8BE63 /* libGHUnitIPhone3_0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B54043BA1151546F00D8BE63 /* libGHUnitIPhone3_0.a */; };
B55252B411D22E2200F9B170 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = B55252B311D22E2200F9B170 /* Reachability.m */; };
B55252B511D22E2200F9B170 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = B55252B311D22E2200F9B170 /* Reachability.m */; };
B55252B611D22E2200F9B170 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = B55252B311D22E2200F9B170 /* Reachability.m */; };
@@ -83,6 +81,7 @@
B57D0F4812AA7D3600E5F992 /* ASIWebPageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B57D0F4712AA7D3600E5F992 /* ASIWebPageRequest.m */; };
B57D0F4912AA7D3600E5F992 /* ASIWebPageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B57D0F4712AA7D3600E5F992 /* ASIWebPageRequest.m */; };
B57D0F4A12AA7D3600E5F992 /* ASIWebPageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B57D0F4712AA7D3600E5F992 /* ASIWebPageRequest.m */; };
+ B581DDCA12FDFEEE003BA9D0 /* GHUnitIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B581DDC912FDFEEE003BA9D0 /* GHUnitIOS.framework */; };
B5873FD610FF28CA001E145F /* ASIS3BucketObject.m in Sources */ = {isa = PBXBuildFile; fileRef = B5873FC210FF28CA001E145F /* ASIS3BucketObject.m */; };
B5873FD810FF28CA001E145F /* ASIS3Request.m in Sources */ = {isa = PBXBuildFile; fileRef = B5873FC610FF28CA001E145F /* ASIS3Request.m */; };
B5873FD910FF28CA001E145F /* ASICloudFilesCDNRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B5873FC910FF28CA001E145F /* ASICloudFilesCDNRequest.m */; };
@@ -105,9 +104,9 @@
B5BD2B0B11CA542700D7C426 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5BD2B0811CA542700D7C426 /* RootViewController.m */; };
B5BD2B0C11CA542700D7C426 /* SampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5BD2B0A11CA542700D7C426 /* SampleViewController.m */; };
B5BD2B0E11CA542700D7C426 /* SampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5BD2B0A11CA542700D7C426 /* SampleViewController.m */; };
+ B5BF64EF12FDFC7100CBC324 /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = B5BF64EE12FDFC7100CBC324 /* GHUnitIOSTestMain.m */; };
B5C6663E100A82D7004F3C96 /* ASIS3RequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5C6663D100A82D7004F3C96 /* ASIS3RequestTests.m */; };
B5EA45AA109B56D800E920CB /* StressTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5EA45A9109B56D800E920CB /* StressTests.m */; };
- B5F95171115237C800EDED69 /* libGHUnitIPhone3_0.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = B54043751151538A00D8BE63 /* libGHUnitIPhone3_0.a */; };
B5FE752711DBBA6400F898C8 /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE752511DBBA6400F898C8 /* ASIDownloadCache.m */; };
B5FE752811DBBA6400F898C8 /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE752511DBBA6400F898C8 /* ASIDownloadCache.m */; };
B5FE752911DBBA6400F898C8 /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FE752511DBBA6400F898C8 /* ASIDownloadCache.m */; };
@@ -133,13 +132,12 @@
/* Begin PBXCopyFilesBuildPhase section */
B5F95181115237CB00EDED69 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
+ buildActionMask = 8;
dstPath = "";
dstSubfolderSpec = 10;
files = (
- B5F95171115237C800EDED69 /* libGHUnitIPhone3_0.a in CopyFiles */,
);
- runOnlyForDeploymentPostprocessing = 0;
+ runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
@@ -176,22 +174,6 @@
B5404004115114BA00D8BE63 /* ASIS3ObjectRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIS3ObjectRequest.m; sourceTree = "<group>"; };
B5404005115114BA00D8BE63 /* ASIS3ServiceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIS3ServiceRequest.h; sourceTree = "<group>"; };
B5404006115114BA00D8BE63 /* ASIS3ServiceRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIS3ServiceRequest.m; sourceTree = "<group>"; };
- B54043751151538A00D8BE63 /* libGHUnitIPhone3_0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGHUnitIPhone3_0.a; path = "External/GHUnit/Project-IPhone/build/CombinedDebug3_0/libGHUnitIPhone3_0.a"; sourceTree = "<group>"; };
- B54043A11151542C00D8BE63 /* GHAsyncTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHAsyncTestCase.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHAsyncTestCase.h"; sourceTree = SOURCE_ROOT; };
- B54043A21151542C00D8BE63 /* GHTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTest.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTest.h"; sourceTree = SOURCE_ROOT; };
- B54043A31151542C00D8BE63 /* GHTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTestCase.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTestCase.h"; sourceTree = SOURCE_ROOT; };
- B54043A41151542C00D8BE63 /* GHTestGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTestGroup.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTestGroup.h"; sourceTree = SOURCE_ROOT; };
- B54043A51151542C00D8BE63 /* GHTesting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTesting.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTesting.h"; sourceTree = SOURCE_ROOT; };
- B54043A61151542C00D8BE63 /* GHTestMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTestMacros.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTestMacros.h"; sourceTree = SOURCE_ROOT; };
- B54043A71151542C00D8BE63 /* GHTestRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTestRunner.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTestRunner.h"; sourceTree = SOURCE_ROOT; };
- B54043A81151542C00D8BE63 /* GHTestSuite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHTestSuite.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHTestSuite.h"; sourceTree = SOURCE_ROOT; };
- B54043A91151542C00D8BE63 /* GHUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHUnit.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHUnit.h"; sourceTree = SOURCE_ROOT; };
- B54043AA1151542C00D8BE63 /* GHUnitIPhoneAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GHUnitIPhoneAppDelegate.h; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHUnitIPhoneAppDelegate.h"; sourceTree = SOURCE_ROOT; };
- B54043AB1151542C00D8BE63 /* GHUnitIPhoneTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GHUnitIPhoneTestMain.m; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHUnitIPhoneTestMain.m"; sourceTree = SOURCE_ROOT; };
- B54043AC1151542C00D8BE63 /* GHUNSObject+Swizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "GHUNSObject+Swizzle.h"; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/GHUNSObject+Swizzle.h"; sourceTree = SOURCE_ROOT; };
- B54043AF1151542C00D8BE63 /* NSException+GHTestFailureExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSException+GHTestFailureExceptions.h"; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/NSException+GHTestFailureExceptions.h"; sourceTree = SOURCE_ROOT; };
- B54043B01151542C00D8BE63 /* NSValue+GHValueFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSValue+GHValueFormatter.h"; path = "External/GHUnit/Project-IPhone/build/Debug-iphonesimulator/NSValue+GHValueFormatter.h"; sourceTree = SOURCE_ROOT; };
- B54043BA1151546F00D8BE63 /* libGHUnitIPhone3_0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libGHUnitIPhone3_0.a; path = "External/GHUnit/Project-IPhone/build/CombinedDebug3_0/libGHUnitIPhone3_0.a"; sourceTree = SOURCE_ROOT; };
B551DB4610D6938500EC1CBF /* ASIHTTPRequestConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIHTTPRequestConfig.h; sourceTree = "<group>"; };
B55252B211D22E2200F9B170 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
B55252B311D22E2200F9B170 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
@@ -242,6 +224,7 @@
B57AF5951258B401002A1F0C /* RequestProgressCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RequestProgressCell.m; path = "iPhone Sample/RequestProgressCell.m"; sourceTree = "<group>"; };
B57D0F4612AA7D3600E5F992 /* ASIWebPageRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASIWebPageRequest.h; path = ASIWebPageRequest/ASIWebPageRequest.h; sourceTree = "<group>"; };
B57D0F4712AA7D3600E5F992 /* ASIWebPageRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASIWebPageRequest.m; path = ASIWebPageRequest/ASIWebPageRequest.m; sourceTree = "<group>"; };
+ B581DDC912FDFEEE003BA9D0 /* GHUnitIOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GHUnitIOS.framework; path = External/GHUnit/GHUnitIOS.framework; sourceTree = "<group>"; };
B5873FC110FF28CA001E145F /* ASIS3BucketObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIS3BucketObject.h; sourceTree = "<group>"; };
B5873FC210FF28CA001E145F /* ASIS3BucketObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIS3BucketObject.m; sourceTree = "<group>"; };
B5873FC510FF28CA001E145F /* ASIS3Request.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIS3Request.h; sourceTree = "<group>"; };
@@ -276,6 +259,7 @@
B5BD2B0811CA542700D7C426 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RootViewController.m; path = "iPhone Sample/RootViewController.m"; sourceTree = "<group>"; };
B5BD2B0911CA542700D7C426 /* SampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SampleViewController.h; path = "iPhone Sample/SampleViewController.h"; sourceTree = "<group>"; };
B5BD2B0A11CA542700D7C426 /* SampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SampleViewController.m; path = "iPhone Sample/SampleViewController.m"; sourceTree = "<group>"; };
+ B5BF64EE12FDFC7100CBC324 /* GHUnitIOSTestMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GHUnitIOSTestMain.m; path = "iPhone Sample/GHUnitIOSTestMain.m"; sourceTree = "<group>"; };
B5C6663C100A82D7004F3C96 /* ASIS3RequestTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIS3RequestTests.h; sourceTree = "<group>"; };
B5C6663D100A82D7004F3C96 /* ASIS3RequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIS3RequestTests.m; sourceTree = "<group>"; };
B5EA45A8109B56D800E920CB /* StressTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StressTests.h; sourceTree = "<group>"; };
@@ -314,9 +298,9 @@
B50C182C121C26FA0055FCAB /* Security.framework in Frameworks */,
B576D4CA11C7CCA60059B815 /* SystemConfiguration.framework in Frameworks */,
B576D4C411C7CC9C0059B815 /* UIKit.framework in Frameworks */,
- B54043BB1151546F00D8BE63 /* libGHUnitIPhone3_0.a in Frameworks */,
DADCEB9A12D5058500958557 /* libxml2.dylib in Frameworks */,
DADCEBA012D505B900958557 /* libz.dylib in Frameworks */,
+ B581DDCA12FDFEEE003BA9D0 /* GHUnitIOS.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -412,6 +396,7 @@
B55B605F0F765A750064029C /* iPhone_Prefix.pch */,
B50F66181297FA45003887B1 /* strict.xcconfig */,
B55B60600F765A750064029C /* main.m */,
+ B5BF64EE12FDFC7100CBC324 /* GHUnitIOSTestMain.m */,
B52329A911CA3380006C6E5A /* UI helpers */,
);
name = "Other Sources";
@@ -437,6 +422,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ B581DDC912FDFEEE003BA9D0 /* GHUnitIOS.framework */,
B576D4C011C7CC970059B815 /* CFNetwork.framework */,
B576D4D011C7CCBC0059B815 /* CoreGraphics.framework */,
B576D52C11C7CEFA0059B815 /* Foundation.framework */,
@@ -444,7 +430,6 @@
B50C182B121C26FA0055FCAB /* Security.framework */,
B576D4C911C7CCA60059B815 /* SystemConfiguration.framework */,
B576D4C311C7CC9C0059B815 /* UIKit.framework */,
- B54043751151538A00D8BE63 /* libGHUnitIPhone3_0.a */,
DADCEB9812D5057700958557 /* libxml2.dylib */,
DADCEB9E12D505AB00958557 /* libz.dylib */,
);
@@ -510,28 +495,6 @@
path = Tests;
sourceTree = "<group>";
};
- B5728DC110AED63D004F4CE6 /* GHUnit */ = {
- isa = PBXGroup;
- children = (
- B54043A11151542C00D8BE63 /* GHAsyncTestCase.h */,
- B54043A21151542C00D8BE63 /* GHTest.h */,
- B54043A31151542C00D8BE63 /* GHTestCase.h */,
- B54043A41151542C00D8BE63 /* GHTestGroup.h */,
- B54043A51151542C00D8BE63 /* GHTesting.h */,
- B54043A61151542C00D8BE63 /* GHTestMacros.h */,
- B54043A71151542C00D8BE63 /* GHTestRunner.h */,
- B54043A81151542C00D8BE63 /* GHTestSuite.h */,
- B54043A91151542C00D8BE63 /* GHUnit.h */,
- B54043AA1151542C00D8BE63 /* GHUnitIPhoneAppDelegate.h */,
- B54043AB1151542C00D8BE63 /* GHUnitIPhoneTestMain.m */,
- B54043AC1151542C00D8BE63 /* GHUNSObject+Swizzle.h */,
- B54043AF1151542C00D8BE63 /* NSException+GHTestFailureExceptions.h */,
- B54043B01151542C00D8BE63 /* NSValue+GHValueFormatter.h */,
- B54043BA1151546F00D8BE63 /* libGHUnitIPhone3_0.a */,
- );
- name = GHUnit;
- sourceTree = "<group>";
- };
B57D0F4412AA7D2300E5F992 /* ASIWebPageRequest */ = {
isa = PBXGroup;
children = (
@@ -585,7 +548,6 @@
isa = PBXGroup;
children = (
B55252B111D22E2200F9B170 /* Reachability */,
- B5728DC110AED63D004F4CE6 /* GHUnit */,
);
path = External;
sourceTree = "<group>";
@@ -597,10 +559,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "iPhone" */;
buildPhases = (
+ B52D492810DA4041008E8365 /* ShellScript */,
1D60588D0D05DD3D006BFB54 /* Resources */,
1D60588E0D05DD3D006BFB54 /* Sources */,
1D60588F0D05DD3D006BFB54 /* Frameworks */,
- B52D492810DA4041008E8365 /* ShellScript */,
);
buildRules = (
);
@@ -615,11 +577,11 @@
isa = PBXNativeTarget;
buildConfigurationList = B55B60CE0F765BB10064029C /* Build configuration list for PBXNativeTarget "Tests" */;
buildPhases = (
+ B52D492410DA403A008E8365 /* ShellScript */,
B55B60C30F765BB00064029C /* Resources */,
B55B60C40F765BB00064029C /* Sources */,
B55B60C50F765BB00064029C /* Frameworks */,
B5F95181115237CB00EDED69 /* CopyFiles */,
- B52D492410DA403A008E8365 /* ShellScript */,
);
buildRules = (
);
@@ -634,10 +596,10 @@
isa = PBXNativeTarget;
buildConfigurationList = B576D72011C7F34D0059B815 /* Build configuration list for PBXNativeTarget "iPad" */;
buildPhases = (
+ B576D71F11C7F34D0059B815 /* ShellScript */,
B576D70311C7F34D0059B815 /* Resources */,
B576D70A11C7F34D0059B815 /* Sources */,
B576D71811C7F34D0059B815 /* Frameworks */,
- B576D71F11C7F34D0059B815 /* ShellScript */,
);
buildRules = (
);
@@ -722,7 +684,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = ./set_version_number.rb;
+ shellScript = "./Build\\ Scripts/set_version_number.rb\n./Build\\ Scripts/fetch_ios_ghunit.rb";
};
B52D492810DA4041008E8365 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -735,7 +697,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = ./set_version_number.rb;
+ shellScript = "./Build\\ Scripts/set_version_number.rb";
};
B576D71F11C7F34D0059B815 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -748,7 +710,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = ./set_version_number.rb;
+ shellScript = "./Build\\ Scripts/set_version_number.rb";
};
/* End PBXShellScriptBuildPhase section */
@@ -813,7 +775,6 @@
B540400C115114BA00D8BE63 /* ASIS3BucketRequest.m in Sources */,
B540400D115114BA00D8BE63 /* ASIS3ObjectRequest.m in Sources */,
B540400E115114BA00D8BE63 /* ASIS3ServiceRequest.m in Sources */,
- B54043B11151542C00D8BE63 /* GHUnitIPhoneTestMain.m in Sources */,
B55252B411D22E2200F9B170 /* Reachability.m in Sources */,
B5FE752711DBBA6400F898C8 /* ASIDownloadCache.m in Sources */,
B51A1A9B11DDF85100ED75CF /* ASIDownloadCacheTests.m in Sources */,
@@ -822,6 +783,7 @@
B53E6D961257B45800C1E79A /* ASIDataCompressor.m in Sources */,
B50D532C126C87ED0022EA6F /* BlocksTests.m in Sources */,
B57D0F4A12AA7D3600E5F992 /* ASIWebPageRequest.m in Sources */,
+ B5BF64EF12FDFC7100CBC324 /* GHUnitIOSTestMain.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -905,6 +867,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/External/GHUnit\"",
+ );
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -914,17 +880,11 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = "${SDK_DIR}/usr/include/libxml2";
INFOPLIST_FILE = "iPhone Sample/Tests-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 2.2.1;
- LIBRARY_SEARCH_PATHS = (
- "\"$(SRCROOT)/Frameworks/libGHUnitIPhone\"",
- "\"$(SRCROOT)/Frameworks/libGHUnitIPhone3_0-0\"",
- "\"$(SRCROOT)/External/GHUnit/Project-IPhone/build/CombinedDebug3_0\"",
- "\"$(SRCROOT)/External/GHUnit/Project-IPhone/build/Debug-iphoneos\"",
- "\"$(SRCROOT)/External/GHUnit/Project-IPhone/build/Debug-iphonesimulator\"",
- );
+ IPHONEOS_DEPLOYMENT_TARGET = 3.2.2;
+ LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = (
- "-all_load",
"-ObjC",
+ "-all_load",
);
PRODUCT_NAME = Tests;
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -940,6 +900,10 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/External/GHUnit\"",
+ );
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -949,17 +913,11 @@
HEADER_SEARCH_PATHS = "${SDK_DIR}/usr/include/libxml2";
INFOPLIST_FILE = "iPhone Sample/Tests-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
- IPHONEOS_DEPLOYMENT_TARGET = 2.2.1;
- LIBRARY_SEARCH_PATHS = (
- "\"$(SRCROOT)/Frameworks/libGHUnitIPhone\"",
- "\"$(SRCROOT)/Frameworks/libGHUnitIPhone3_0-0\"",
- "\"$(SRCROOT)/External/GHUnit/Project-IPhone/build/CombinedDebug3_0\"",
- "\"$(SRCROOT)/External/GHUnit/Project-IPhone/build/Debug-iphoneos\"",
- "\"$(SRCROOT)/External/GHUnit/Project-IPhone/build/Debug-iphonesimulator\"",
- );
+ IPHONEOS_DEPLOYMENT_TARGET = 3.2.2;
+ LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = (
- "-all_load",
"-ObjC",
+ "-all_load",
);
PREBINDING = NO;
PRODUCT_NAME = Tests;
Please sign in to comment.
Something went wrong with that request. Please try again.