Commits

Perry Metzger committed 1bc345e

Fix GrowlPreInstall "script"

Comments (0)

Files changed (5)

Release/Growl/GrowlPreInstall/AEVTBuilder.m

 	OSStatus err = AECoerceDesc([descriptor aeDesc], ostype, &coercedDesc);
 	if(err)
 	{
-		NSLog(@"Got error %d when calling AECoerceDesc");
+		NSLog(@"Got error %d when calling AECoerceDesc", err);
 		return nil;
 	}
 	

Release/Growl/GrowlPreInstall/GrowlPreInstall.m

 		NSError *error = nil;
 		if (![[NSFileManager defaultManager] removeItemAtPath:path error:&error]) {
 			NSLog(@"Could not remove old prefpane at %@ while installing to %@ (preinstall running as user %@): Error %@", path, destinationDirectory, NSUserName(), error);
-			status = EXIT_FAILURE;
+            // This was probably wrong, since mere absence of a pre-existing prefpane could fail
+			// status = EXIT_FAILURE;
 		}
 	}
 

Release/Growl/GrowlPreInstall/GrowlPreInstall.xcodeproj/project.pbxproj

 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		34A96CF40C95E6F800F46006 /* AEVTBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A96CF30C95E6F800F46006 /* AEVTBuilder.m */; };
 		8DD76F9A0486AA7600D96B5E /* GrowlPreInstall.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* GrowlPreInstall.m */; settings = {ATTRIBUTES = (); }; };
 		8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
-		8DD76F9F0486AA7600D96B5E /* GrowlPostInstall.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859EA3029092ED04C91782 /* GrowlPostInstall.1 */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
 			dstPath = /usr/share/man/man1/;
 			dstSubfolderSpec = 0;
 			files = (
-				8DD76F9F0486AA7600D96B5E /* GrowlPostInstall.1 in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
 		34A96CF20C95E6F800F46006 /* AEVTBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEVTBuilder.h; sourceTree = "<group>"; };
 		34A96CF30C95E6F800F46006 /* AEVTBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEVTBuilder.m; sourceTree = "<group>"; };
 		8DD76FA10486AA7600D96B5E /* GrowlPreInstall */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = GrowlPreInstall; sourceTree = BUILT_PRODUCTS_DIR; };
-		C6859EA3029092ED04C91782 /* GrowlPostInstall.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = GrowlPostInstall.1; sourceTree = "<group>"; };
+		C26709DC1444D4FB00F2B5BA /* GrowlPreInstall.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = GrowlPreInstall.1; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		C6859EA2029092E104C91782 /* Documentation */ = {
 			isa = PBXGroup;
 			children = (
-				C6859EA3029092ED04C91782 /* GrowlPostInstall.1 */,
+				C26709DC1444D4FB00F2B5BA /* GrowlPreInstall.1 */,
 			);
 			name = Documentation;
 			sourceTree = "<group>";
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0410;
+			};
 			buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "GrowlPreInstall" */;
-			compatibilityVersion = "Xcode 3.0";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 		1DEB927908733DD40010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.3;
-				PREBINDING = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
 		1DEB927A08733DD40010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.3;
-				PREBINDING = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				SDKROOT = macosx;
 				SEPARATE_STRIP = YES;
 				STRIP_INSTALLED_PRODUCT = YES;
 			};

Release/Growl/GrowlPreInstall/Makefile

+all:
+	xcodebuild -alltargets -configuration Release build
+
+clean:
+	rm -rf build
Add a comment to this file

Release/Growl/scripts/GrowlPreInstall

Binary file modified.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.