Commits

Tuukka Norri committed e016cda

Build-related bug fixes
- At some point items from Copy frameworks build phase had been dropped in IB plugin and the assistant. Fixed this.
- Had accidentally added some newlines to shell scripts. Removed them.
- Replaced cp and rm in (some) shell scripts with /bin/cp and /bin/rm. Otherwise they could be substituted with user-installed cp and rm (in /usr/local/bin or /sw/bin for example).
- Added GC support to SQL reader's build flags even in Release configuration.

Comments (0)

Files changed (7)

BaseTen.xcodeproj/project.pbxproj

 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-            shellScript = "ICON_FOLDER_PATH=\"$PROJECT_DIR/BaseTenFrameworkIcon\"\n\n\"$PROJECT_DIR/unzip.sh\" \"$PROJECT_DIR/BaseTenFrameworkIcon.zip\" \"$I
-CON_FOLDER_PATH\"\n\"$PROJECT_DIR/set_icon.sh\" \"$ICON_FOLDER_PATH\" \"$TARGET_BUILD_DIR/$WRAPPER_NAME\"\n";
+			shellScript = "ICON_FOLDER_PATH=\"$PROJECT_DIR/BaseTenFrameworkIcon\"\n\n\"$PROJECT_DIR/unzip.sh\" \"$PROJECT_DIR/BaseTenFrameworkIcon.zip\" \"$ICON_FOLDER_PATH\"\n\"$PROJECT_DIR/set_icon.sh\" \"$ICON_FOLDER_PATH\" \"$TARGET_BUILD_DIR/$WRAPPER_NAME\"\n";
 			showEnvVarsInLog = 0;
 		};
 		5362E86B0E1CE46D005C7654 /* ShellScript */ = {
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_GC = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(BUILT_PRODUCTS_DIR)/BaseTen-PostgreSQL/postgresql",
 					"$(BUILT_PRODUCTS_DIR)/BaseTen-PostgreSQL/postgresql/include",

BaseTenAppKit/BaseTenAppKit.xcodeproj/project.pbxproj

 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-            shellScript = "ICON_FOLDER_PATH=\"$PROJECT_DIR/../BaseTenFrameworkIcon\"\n\n\"$PROJECT_DIR/../unzip.sh\" \"$PROJECT_DIR/../BaseTenFrameworkIcon.zip\" \"$ICON_FOLDER_PATH\"\n\"$PROJECT_DIR/../set_icon.sh\" \"$ICON_FOLDER_PATH\" \"$TARGET_BUILD_DIR/$WRAPPER_NAME\"\n";
+			shellScript = "ICON_FOLDER_PATH=\"$PROJECT_DIR/../BaseTenFrameworkIcon\"\n\n\"$PROJECT_DIR/../unzip.sh\" \"$PROJECT_DIR/../BaseTenFrameworkIcon.zip\" \"$ICON_FOLDER_PATH\"\n\"$PROJECT_DIR/../set_icon.sh\" \"$ICON_FOLDER_PATH\" \"$TARGET_BUILD_DIR/$WRAPPER_NAME\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

BaseTenAssistant/BaseTenAssistant.xcodeproj/project.pbxproj

 		53EF32B90E23B7220027EA18 /* Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5374E4B70B0D364E000D353D /* Additions.m */; };
 		53EF33B50E23CC430027EA18 /* BXASchemaCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 53EF33B40E23CC430027EA18 /* BXASchemaCell.m */; };
 		53EF34510E23D83B0027EA18 /* BXAEntityCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 53EF34500E23D83B0027EA18 /* BXAEntityCell.m */; };
+		53F7498F0E362E53003C2E55 /* BaseTen.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5388DCDB0E23AE22006CDBD8 /* BaseTen.framework */; };
+		53F749990E362E69003C2E55 /* BaseTenAppKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 53F749980E362E62003C2E55 /* BaseTenAppKit.framework */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 /* End PBXBuildFile section */
 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
 			remoteInfo = "RegexKit Framework";
 		};
+		53F749970E362E62003C2E55 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 53F749930E362E62003C2E55 /* BaseTenAppKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 535444870D634D9C002A6C47;
+			remoteInfo = "BaseTenAppKit + GC";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				53F7498F0E362E53003C2E55 /* BaseTen.framework in Copy Frameworks */,
+				53F749990E362E69003C2E55 /* BaseTenAppKit.framework in Copy Frameworks */,
 				5395E8450E2F9FE8006E8441 /* RegexKit.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 		53EF33B40E23CC430027EA18 /* BXASchemaCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BXASchemaCell.m; path = Source/BXASchemaCell.m; sourceTree = "<group>"; };
 		53EF344F0E23D83B0027EA18 /* BXAEntityCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BXAEntityCell.h; path = Source/BXAEntityCell.h; sourceTree = "<group>"; };
 		53EF34500E23D83B0027EA18 /* BXAEntityCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BXAEntityCell.m; path = Source/BXAEntityCell.m; sourceTree = "<group>"; };
+		53F749930E362E62003C2E55 /* BaseTenAppKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BaseTenAppKit.xcodeproj; path = ../BaseTenAppKit/BaseTenAppKit.xcodeproj; sourceTree = SOURCE_ROOT; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* BaseTen Assistant.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BaseTen Assistant.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 			isa = PBXGroup;
 			children = (
 				5388DCD20E23AE22006CDBD8 /* BaseTen.xcodeproj */,
+				53F749930E362E62003C2E55 /* BaseTenAppKit.xcodeproj */,
 				5395E8210E2F9F15006E8441 /* RegexKit.xcodeproj */,
 				5388DE290E23AE48006CDBD8 /* Cocoa.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		53F749940E362E62003C2E55 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				53F749980E362E62003C2E55 /* BaseTenAppKit.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 					ProjectRef = 5388DCD20E23AE22006CDBD8 /* BaseTen.xcodeproj */;
 				},
 				{
+					ProductGroup = 53F749940E362E62003C2E55 /* Products */;
+					ProjectRef = 53F749930E362E62003C2E55 /* BaseTenAppKit.xcodeproj */;
+				},
+				{
 					ProductGroup = 5395E8220E2F9F15006E8441 /* Products */;
 					ProjectRef = 5395E8210E2F9F15006E8441 /* RegexKit.xcodeproj */;
 				},
 			remoteRef = 5395E8320E2F9F15006E8441 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		53F749980E362E62003C2E55 /* BaseTenAppKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = BaseTenAppKit.framework;
+			remoteRef = 53F749970E362E62003C2E55 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */

InterfaceBuilderPlugin/InterfaceBuilderPlugin.xcodeproj/project.pbxproj

 		53978F8D0CEC709200B93B3C /* BXArrayController.png in Resources */ = {isa = PBXBuildFile; fileRef = 53978F8A0CEC709200B93B3C /* BXArrayController.png */; };
 		53978F8E0CEC709200B93B3C /* BXDatabaseObject.png in Resources */ = {isa = PBXBuildFile; fileRef = 53978F8B0CEC709200B93B3C /* BXDatabaseObject.png */; };
 		53978F8F0CEC709200B93B3C /* Palette5.icns in Resources */ = {isa = PBXBuildFile; fileRef = 53978F8C0CEC709200B93B3C /* Palette5.icns */; };
+		53F749640E362DFA003C2E55 /* BaseTen.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5373CC8D0D65B9710084BD9D /* BaseTen.framework */; };
+		53F749680E362DFD003C2E55 /* BaseTenAppKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5373CC900D65B9710084BD9D /* BaseTenAppKit.framework */; };
 		8D1AC9700486D14A00FE50C9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD92D38A0106425D02CA0E72 /* Cocoa.framework */; };
 		8D1AC9800486D23B00FE50C9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */; };
 		C0D069560A49DF9100C95564 /* InterfaceBuilderKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D069550A49DF9100C95564 /* InterfaceBuilderKit.framework */; };
 			isa = PBXContainerItemProxy;
 			containerPortal = 53978FCC0CEC764300B93B3C /* BaseTen.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 538A82C10E1D16AC0025B3C8 /* SQLParser.o */;
+			remoteGlobalIDString = 538A82C10E1D16AC0025B3C8;
 			remoteInfo = "SQL Parser";
 		};
 /* End PBXContainerItemProxy section */
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				53F749640E362DFA003C2E55 /* BaseTen.framework in Copy Frameworks */,
+				53F749680E362DFD003C2E55 /* BaseTenAppKit.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;

ReleaseDMG/BaseTen-master.sparseImage.gz

Binary file modified.

ReleaseDMG/dmg_helper.sh

 #!/bin/bash
 
+CP=/bin/cp
+RM=/bin/rm
+
 # Check that OBJROOT exists
 if [ ! -d "$OBJROOT" ]
 then
 
 
 # Remove all previous BaseTen disk images
-rm -f BaseTen.dmg
-#rm -f BaseTen-master.sparseimage
+"$RM" -f BaseTen.dmg
+#"$RM" -f BaseTen-master.sparseimage
 
 if [ -d "/Volumes/BaseTen" ]
 then
 fi
 
 # Copy built BaseTen.framework and BaseTenAppKit.framework to new disk image
-rm -rf /Volumes/BaseTen/BaseTen.framework
-cp -pRP "$SYMROOT"/Release/BaseTen.framework /Volumes/BaseTen/.
+"$RM" -rf /Volumes/BaseTen/BaseTen.framework
+"$CP" -pRP "$SYMROOT"/Release/BaseTen.framework /Volumes/BaseTen/.
 
-rm -rf /Volumes/BaseTen/BaseTenAppKit.framework
-cp -pRP "$SYMROOT"/Release/BaseTenAppKit.framework /Volumes/BaseTen/.
+"$RM" -rf /Volumes/BaseTen/BaseTenAppKit.framework
+"$CP" -pRP "$SYMROOT"/Release/BaseTenAppKit.framework /Volumes/BaseTen/.
 
-rm -rf /Volumes/BaseTen/BaseTen\ Assistant.app
-cp -pRP "$SYMROOT"/Release/BaseTen\ Assistant.app /Volumes/BaseTen/.
+"$RM" -rf /Volumes/BaseTen/BaseTen\ Assistant.app
+"$CP" -pRP "$SYMROOT"/Release/BaseTen\ Assistant.app /Volumes/BaseTen/.
 
-rm -rf /Volumes/BaseTen/InterfaceBuilderPlugin.ibplugin
-cp -pRP "$SYMROOT"/Release/"BaseTen Plug-in.ibplugin" /Volumes/BaseTen/.
+"$RM" -rf /Volumes/BaseTen/InterfaceBuilderPlugin.ibplugin
+"$CP" -pRP "$SYMROOT"/Release/"BaseTen Plug-in.ibplugin" /Volumes/BaseTen/.
 
-rm -f /Volumes/BaseTen/Frameworks
+"$RM" -f /Volumes/BaseTen/Frameworks
 ln -s /Library/Frameworks /Volumes/BaseTen/Frameworks
 
 # Copy Finder .DS_Store data
-cp DMG_DS_Store /Volumes/BaseTen/.DS_Store
+"$CP" DMG_DS_Store /Volumes/BaseTen/.DS_Store
 
 # Copy volume icon and set it
-#cp DMG_VolumeIcon.icns /Volumes/BaseTen/.VolumeIcon.icns
+#"$CP" DMG_VolumeIcon.icns /Volumes/BaseTen/.VolumeIcon.icns
 #SetFile -a Ci /Volumes/BaseTen
 
 
 hdiutil verify BaseTen.dmg
 
 # Clean up
-rm -f BaseTen-temp.sparseimage
+"$RM" -f BaseTen-temp.sparseimage
 
 SOURCE_ICON_FOLDER=$1
 TARGET_BUNDLE_PATH=$2
 
-cp "$SOURCE_ICON_FOLDER/"Icon* "$TARGET_BUNDLE_PATH"
 /Developer/Tools/SetFile -a Ci "$TARGET_BUNDLE_PATH"
+/bin/cp "$SOURCE_ICON_FOLDER/"Icon* "$TARGET_BUNDLE_PATH"