From 7bbf00e315d4fc45eb3a54e256f2aeb3ea379d21 Mon Sep 17 00:00:00 2001
From: Stuart Connolly <stuart02@gmail.com>
Date: Sun, 19 Jan 2014 00:17:42 +0000
Subject: Fix make files and running tests.

---
 Frameworks/QueryKit/Makefile                         | 16 ++++++----------
 .../QueryKit/QueryKit.xcodeproj/project.pbxproj      | 20 +++-----------------
 2 files changed, 9 insertions(+), 27 deletions(-)

(limited to 'Frameworks/QueryKit')

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;
-- 
cgit v1.2.3