Commits

Tuukka Norri committed a634f69

Building the framework no longer requires RegexKit
- RegexKit is still needed for the Assistant, though.

  • Participants
  • Parent commits 0443dfd

Comments (0)

Files changed (4)

BaseTen.xcodeproj/project.pbxproj

 			remoteGlobalIDString = 53BD79F70E092ABC009CAFE6;
 			remoteInfo = Documentation;
 		};
-		53F1C60F105C4DDD00A610A8 /* PBXContainerItemProxy */ = {
+		53C4E24D1194B2EE003FB842 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 53F1C5DF105C4BF200A610A8;
-			remoteInfo = "RegexKit-test";
+			remoteGlobalIDString = 53C4E2441194B2BE003FB842 /* PCRE */;
+			remoteInfo = PCRE;
 		};
 /* End PBXContainerItemProxy section */
 
 		53BFE53B0FAF2EFA0004533F /* BXError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXError.h; path = Sources/BXError.h; sourceTree = "<group>"; };
 		53BFE53C0FAF2EFA0004533F /* BXError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BXError.m; path = Sources/BXError.m; sourceTree = "<group>"; };
 		53C4C3F31192EC10003FB842 /* BXCFHostCompatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXCFHostCompatibility.h; path = Sources/BXCFHostCompatibility.h; sourceTree = "<group>"; };
+		53C4E26B1194C757003FB842 /* pcre.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pcre.h; path = "Contrib/RegexKit/RegexKit-patched-source/Source/Headers/RegexKit/pcre.h"; sourceTree = "<group>"; };
 		53C8CC63118F1B8800E7AF88 /* BXDatabaseObjectModelStoragePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXDatabaseObjectModelStoragePrivate.h; path = Sources/BXDatabaseObjectModelStoragePrivate.h; sourceTree = "<group>"; };
 		53C8CC64118F1B8800E7AF88 /* BXDatabaseObjectModelPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXDatabaseObjectModelPrivate.h; path = Sources/BXDatabaseObjectModelPrivate.h; sourceTree = "<group>"; };
 		53CE79690E87F29C00D5A310 /* BXPGQueryHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXPGQueryHandler.h; path = Sources/BXPGQueryHandler.h; sourceTree = "<group>"; };
 		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				53C4E26B1194C757003FB842 /* pcre.h */,
+				535B3E1D1038146500A5FB7E /* libpcre.a */,
 				53DBE8010B666C3B00C3D20A /* libcrypto.dylib */,
 				53DBE8120B666C7900C3D20A /* libssl.dylib */,
 				538679870DE31C1D000C9A78 /* libstdc++.6.dylib */,
-				535B3E1D1038146500A5FB7E /* libpcre.a */,
 				0867D69BFE84028FC02AAC07 /* Foundation.framework */,
 				5354F9400F00537200422613 /* AppKit.framework */,
 				D2F7E79907B2D74100F64583 /* CoreData.framework */,
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXLegacyTarget section */
+		53C4E2441194B2BE003FB842 /* PCRE */ = {
+			isa = PBXLegacyTarget;
+			buildArgumentsString = "-f \"$(SRCROOT)/Tools/pcre.mk\" $(ACTION)";
+			buildConfigurationList = 53C4E2451194B2BE003FB842 /* Build configuration list for PBXLegacyTarget "PCRE" */;
+			buildPhases = (
+			);
+			buildToolPath = /usr/bin/make;
+			buildWorkingDirectory = Contrib/RegexKit;
+			dependencies = (
+			);
+			name = PCRE;
+			passBuildSettingsInEnvironment = 1;
+			productName = "RegexKit-test";
+		};
 		53F1C5DF105C4BF200A610A8 /* RegexKit */ = {
 			isa = PBXLegacyTarget;
 			buildArgumentsString = "-f \"$(SRCROOT)/Tools/RegexKit.mk\" $(ACTION)";
 			);
 			dependencies = (
 				5362E8710E1CE4A9005C7654 /* PBXTargetDependency */,
-				53F1C610105C4DDD00A610A8 /* PBXTargetDependency */,
+				53C4E24E1194B2EE003FB842 /* PBXTargetDependency */,
 			);
 			name = "BaseTen Framework + GC";
 			productName = "BXDatabase Static";
 				5362E86C0E1CE46D005C7654 /* PostgreSQL-universal */,
 				537934A50E54B71B0006EC54 /* PostgreSQL-arm */,
 				53F1C5DF105C4BF200A610A8 /* RegexKit */,
+				53C4E2441194B2BE003FB842 /* PCRE */,
 			);
 		};
 /* End PBXProject section */
 			target = 53BD79F70E092ABC009CAFE6 /* Documentation */;
 			targetProxy = 53BD7A000E092BD5009CAFE6 /* PBXContainerItemProxy */;
 		};
-		53F1C610105C4DDD00A610A8 /* PBXTargetDependency */ = {
+		53C4E24E1194B2EE003FB842 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 53F1C5DF105C4BF200A610A8 /* RegexKit */;
-			targetProxy = 53F1C60F105C4DDD00A610A8 /* PBXContainerItemProxy */;
+			target = 53C4E2441194B2BE003FB842 /* PCRE */;
+			targetProxy = 53C4E24D1194B2EE003FB842 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 			};
 			name = Release;
 		};
+		53C4E2461194B2BE003FB842 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = RegexKit;
+			};
+			name = Debug;
+		};
+		53C4E2471194B2BE003FB842 /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = RegexKit;
+			};
+			name = Coverage;
+		};
+		53C4E2481194B2BE003FB842 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = RegexKit;
+			};
+			name = Release;
+		};
 		53F1C5E0105C4BF200A610A8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		53C4E2451194B2BE003FB842 /* Build configuration list for PBXLegacyTarget "PCRE" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				53C4E2461194B2BE003FB842 /* Debug */,
+				53C4E2471194B2BE003FB842 /* Coverage */,
+				53C4E2481194B2BE003FB842 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		53F1C5E3105C4C1000A610A8 /* Build configuration list for PBXLegacyTarget "RegexKit" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Sources/PGTSDates.m

 //
 
 
-#import <RegexKit/pcre.h>
+#import "pcre.h"
 #import "PGTSDates.h"
 #import "PGTSConnection.h"
 #import "PGTSTypeDescription.h"

Tools/RegexKit-common.mk

+CP = /bin/cp
+RM = /bin/rm
+MV = /bin/mv
+ENV = /usr/bin/env
+PATCH = /usr/bin/patch
+XCODEBUILD = xcodebuild
+
+BUILD_SETTINGS_DIR = RegexKit-patched-source/Source/Build/Xcode
+
+
+.PHONY: all build clean RegexKit-build RegexKit-clean RegexKit-xc
+
+
+build: RegexKit-build
+
+
+clean: RegexKit-clean
+	$(RM) -rf RegexKit-patched-source
+
+
+RegexKit-build: RegexKit-patched-source RegexKit-xc
+
+
+RegexKit-clean: RegexKit-xc
+
+
+RegexKit-xc: RegexKit-patched-source
+	@if [ -n "$(BUILD_DIR)" ] && [ -n "$(OBJROOT)" ]; then \
+		cd RegexKit-patched-source; \
+		$(ENV) -i PATH="$(PATH)" \
+			$(XCODEBUILD) -configuration Release -target $(TARGET) \
+				$(MAKECMDGOALS) \
+				SYMROOT="$(BUILD_DIR)" \
+				OBJROOT="$(OBJROOT)" \
+				GCC_VERSION=4.0; \
+	fi
+
+
+RegexKit-patched-source:
+	@if [ -z "$(BUILD_DIR)" ]; then \
+		echo "BUILD_DIR wasn't set."; \
+		exit 1; \
+	fi
+
+	@if [ -z "$(OBJROOT)" ]; then \
+		echo "OBJROOT wasn't set."; \
+		exit 1; \
+	fi
+
+	$(CP) -pLR RegexKit-current-source RegexKit-patched-source
+	$(PATCH) -d RegexKit-patched-source -p0 < ../../Patches/pcre-makefile.patch
+
+	$(MV) -i $(BUILD_SETTINGS_DIR)/"RegexKit Build Settings.xcconfig" $(BUILD_SETTINGS_DIR)/RegexKit_Build_Settings.xcconfig
+	$(PATCH) -d RegexKit-patched-source -p0 < ../../Patches/pcre-build.patch
+	$(MV) -i $(BUILD_SETTINGS_DIR)/RegexKit_Build_Settings.xcconfig $(BUILD_SETTINGS_DIR)/"RegexKit Build Settings.xcconfig"

Tools/RegexKit.mk

-CP = /bin/cp
-RM = /bin/rm
-MV = /bin/mv
-ENV = /usr/bin/env
-PATCH = /usr/bin/patch
-XCODEBUILD = xcodebuild
-
-BUILD_SETTINGS_DIR = RegexKit-patched-source/Source/Build/Xcode
-
-
-.PHONY: all build clean RegexKit-build RegexKit-clean RegexKit-xc
-
-
-build: RegexKit-build
-
-
-clean: RegexKit-clean
-	$(RM) -rf RegexKit-patched-source
-
-
-RegexKit-build: RegexKit-patched-source RegexKit-xc
-
-
-RegexKit-clean: RegexKit-xc
-
-
-RegexKit-xc:
-	@if [ -n "$(BUILD_DIR)" ] && [ -n "$(OBJROOT)" ]; then \
-		cd RegexKit-patched-source; \
-		$(ENV) -i PATH="$(PATH)" \
-			$(XCODEBUILD) -configuration Release -target "RegexKit Framework" \
-				$(MAKECMDGOALS) \
-				SYMROOT="$(BUILD_DIR)" \
-				OBJROOT="$(OBJROOT)" \
-				GCC_VERSION=4.0; \
-	fi
-
-
-RegexKit-patched-source:
-	@if [ -z "$(BUILD_DIR)" ]; then \
-		echo "BUILD_DIR wasn't set."; \
-		exit 1; \
-	fi
-
-	@if [ -z "$(OBJROOT)" ]; then \
-		echo "OBJROOT wasn't set."; \
-		exit 1; \
-	fi
-
-	$(CP) -pLR RegexKit-current-source RegexKit-patched-source
-	$(PATCH) -d RegexKit-patched-source -p0 < ../../Patches/pcre-makefile.patch
-
-	$(MV) -i $(BUILD_SETTINGS_DIR)/"RegexKit Build Settings.xcconfig" $(BUILD_SETTINGS_DIR)/RegexKit_Build_Settings.xcconfig
-	$(PATCH) -d RegexKit-patched-source -p0 < ../../Patches/pcre-build.patch
-	$(MV) -i $(BUILD_SETTINGS_DIR)/RegexKit_Build_Settings.xcconfig $(BUILD_SETTINGS_DIR)/"RegexKit Build Settings.xcconfig"
+TARGET = "RegexKit Framework"
+include $(SRCROOT)/Tools/RegexKit-common.mk