diff options
Diffstat (limited to 'Frameworks')
| -rw-r--r-- | Frameworks/PostgresKit/Makefile | 16 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj | 28 | ||||
| -rw-r--r-- | Frameworks/QueryKit/Makefile | 16 | ||||
| -rw-r--r-- | Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj | 20 |
4 files changed, 23 insertions, 57 deletions
diff --git a/Frameworks/PostgresKit/Makefile b/Frameworks/PostgresKit/Makefile index 8a01c273..daabf526 100644 --- a/Frameworks/PostgresKit/Makefile +++ b/Frameworks/PostgresKit/Makefile @@ -8,20 +8,16 @@ BUILD_CONFIG?=$(CONFIG) CP=ditto --rsrc RM=rm -.PHONY: postgreskit test clean clean-all latest +.PHONY: postgreskit test analyze clean querykit: - xcodebuild -project PostgresKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) build + xcodebuild -project PostgresKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(PGK_CFLAGS)" $(OPTIONS) build test: - xcodebuild -project PostgresKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" -target Tests $(OPTIONS) build + xcodebuild -project PostgresKit.xcodeproj -scheme "PostgresKit" -configuration "$(BUILD_CONFIG)" CFLAGS="$(PGK_CFLAGS)" $(OPTIONS) test -clean: - xcodebuild -project PostgresKit.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) -nodependencies clean +analyze: + xcodebuild -project PostgresKit.xcodeproj -scheme "PostgresKit" -configuration "$(BUILD_CONFIG)" CFLAGS="$(PGK_CFLAGS)" $(OPTIONS) analyze -clean-all: +clean: xcodebuild -project PostgresKit.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) clean - -latest: - svn update - make postgreskit
\ No newline at end of file diff --git a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj index 57c95355..b7ceec7e 100644 --- a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj +++ b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj @@ -452,7 +452,6 @@ buildPhases = ( 1724CD0015FB68E800AB2291 /* Sources */, 1724CD0115FB68E800AB2291 /* Frameworks */, - 1724CD0215FB68E800AB2291 /* ShellScript */, ); buildRules = ( ); @@ -487,6 +486,8 @@ /* Begin PBXProject section */ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "PostgresKit" */; compatibilityVersion = "Xcode 3.1"; developmentRegion = English; @@ -508,22 +509,6 @@ }; /* End PBXProject section */ -/* Begin PBXShellScriptBuildPhase section */ - 1724CD0215FB68E800AB2291 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Scripts/run-tests.sh\"\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 1724CD0015FB68E800AB2291 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -595,6 +580,7 @@ ); PREBINDING = YES; PRODUCT_NAME = Tests; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -621,6 +607,7 @@ ); PREBINDING = YES; PRODUCT_NAME = Tests; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; @@ -646,6 +633,7 @@ ); PREBINDING = YES; PRODUCT_NAME = Tests; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Distribution; @@ -663,7 +651,7 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Distribution; @@ -827,7 +815,7 @@ INFOPLIST_PREFIX_HEADER = ""; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Debug; @@ -845,7 +833,7 @@ INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Release; diff --git a/Frameworks/QueryKit/Makefile b/Frameworks/QueryKit/Makefile index d6322e51..2f776fbc 100644 --- a/Frameworks/QueryKit/Makefile +++ b/Frameworks/QueryKit/Makefile @@ -8,20 +8,16 @@ BUILD_CONFIG?=$(CONFIG) CP=ditto --rsrc RM=rm -.PHONY: querykit test clean clean-all latest +.PHONY: querykit test analyze clean latest querykit: - xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) build + xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(QK_CFLAGS)" $(OPTIONS) build test: - xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" -target Tests $(OPTIONS) build + xcodebuild -project QueryKit.xcodeproj -scheme "QueryKit" -configuration "$(BUILD_CONFIG)" CFLAGS="$(QK_CFLAGS)" $(OPTIONS) test -clean: - xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) -nodependencies clean +analyze: + xcodebuild -project QueryKit.xcodeproj -scheme "QueryKit" -configuration "$(BUILD_CONFIG)" CFLAGS="$(QK_CFLAGS)" $(OPTIONS) analyze -clean-all: +clean: xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) clean - -latest: - svn update - make querykit diff --git a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj index bc8dc5a8..aa6ea9ce 100644 --- a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj +++ b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj @@ -321,7 +321,6 @@ buildPhases = ( 17E5969A14F307CE0054EE08 /* Sources */, 17E5969B14F307CE0054EE08 /* Frameworks */, - 17E5969C14F307CE0054EE08 /* ShellScript */, ); buildRules = ( ); @@ -391,22 +390,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 17E5969C14F307CE0054EE08 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 17E5969A14F307CE0054EE08 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -544,6 +527,7 @@ SenTestingKit, ); PRODUCT_NAME = Tests; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -569,6 +553,7 @@ SenTestingKit, ); PRODUCT_NAME = Tests; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; @@ -593,6 +578,7 @@ SenTestingKit, ); PRODUCT_NAME = Tests; + TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; }; name = Distribution; |