resolving merge conflict

ClickToFlash.xcodeproj/project.pbxproj

@@ -36,6 +36,7 @@
 /* Begin PBXBuildFile section */
 		0038DE240FC0CCF0007B54E9 /* MATrackingArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 0038DE230FC0CCF0007B54E9 /* MATrackingArea.m */; };
 		0038DE320FC0CE7B007B54E9 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0038DE310FC0CE7B007B54E9 /* Carbon.framework */; };
+		00FBE92F0FCD68CE00BC0995 /* NSActionTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 00FBE92E0FCD68CE00BC0995 /* NSActionTemplate.png */; };
 		072189BE0F30D9C3008C8944 /* ContextualMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 072189BA0F30D9C3008C8944 /* ContextualMenu.xib */; };
 		072189BF0F30D9C3008C8944 /* WhitelistPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 072189BC0F30D9C3008C8944 /* WhitelistPanel.xib */; };
 		55EB70480E04A8850016593D /* Plugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EB703D0E04A84F0016593D /* Plugin.m */; };
@@ -131,6 +132,7 @@
 		0038DE220FC0CCF0007B54E9 /* MATrackingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MATrackingArea.h; sourceTree = "<group>"; };
 		0038DE230FC0CCF0007B54E9 /* MATrackingArea.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MATrackingArea.m; sourceTree = "<group>"; };
 		0038DE310FC0CE7B007B54E9 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		00FBE92E0FCD68CE00BC0995 /* NSActionTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = NSActionTemplate.png; sourceTree = "<group>"; };
 		072189BB0F30D9C3008C8944 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Plugin/English.lproj/ContextualMenu.xib; sourceTree = "<group>"; };
 		072189BD0F30D9C3008C8944 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Plugin/English.lproj/WhitelistPanel.xib; sourceTree = "<group>"; };
 		55EB703C0E04A84F0016593D /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = Plugin/Plugin.h; sourceTree = "<group>"; };
@@ -249,6 +251,7 @@
 				072189BC0F30D9C3008C8944 /* WhitelistPanel.xib */,
 				D9FFA7650F3941C1008A8708 /* ClickToFlash_Prefix.pch */,
 				A494CC2B0F9F2446007D5EEB /* ctf.icns */,
+				00FBE92E0FCD68CE00BC0995 /* NSActionTemplate.png */,
 				D9566C2B0F37EA0800358646 /* deSIFR Resources */,
 				79E2EB910F86AAD3005CF170 /* SparkleManager.h */,
 				79E2EB920F86AAD3005CF170 /* SparkleManager.m */,
@@ -407,6 +410,7 @@
 				072189BF0F30D9C3008C8944 /* WhitelistPanel.xib in Resources */,
 				6953E43C0F3EDEB50014ECF7 /* MenubarMenu.xib in Resources */,
 				A494CC2C0F9F2446007D5EEB /* ctf.icns in Resources */,
+				00FBE92F0FCD68CE00BC0995 /* NSActionTemplate.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -446,7 +450,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $BUILD_STYLE != \"Release\" ]; then\n     echo \"Could not generate package.\"\n\techo \"Active Configuration needs to be set to 'Release'.\"\n\texit 1\nfi\n\n# Sparkle currently can't handle -$VERSION in .pkg names.\nBUILT_PKG=\"$BUILT_PRODUCTS_DIR/ClickToFlash.pkg\"\nVERSIONED_NAME=\"ClickToFlash-$PRODUCT_VERSION\"\nBUILT_ZIP=\"$BUILT_PRODUCTS_DIR/$VERSIONED_NAME.zip\"\n\n# Delete old files if there are any around.\nif [ -f \"$BUILT_PKG\" ]; then\n\trm -rf \"$BUILT_PKG\"\nfi\nif [ -f \"$BUILT_ZIP\" ]; then\n\trm -rf \"$BUILT_ZIP\"\nfi\n\n# Create the .pkg.\ncd \"$PROJECT_DIR/Package\"\n\"$SYSTEM_DEVELOPER_UTILITIES_DIR/PackageMaker.app/Contents/MacOS/PackageMaker\" --doc \"Package Template.pmdoc\" -i com.github.rentzsch.clicktoflash.pkg -n \"$PRODUCT_VERSION\" -o \"$BUILT_PKG\"\n\n# Stuff it into a .zip.\ncd \"$BUILT_PRODUCTS_DIR\"\nzip -r \"$VERSIONED_NAME.zip\" \"ClickToFlash.pkg\"\n\n# Delete the intermediate .pkg.\nrm -rf \"$BUILT_PKG\"";
+			shellScript = "bash $PROJECT_DIR/Installer/build_installer_pkg.command\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -551,7 +555,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PRODUCT_VERSION = 1.4.2;
+				PRODUCT_VERSION = 1.5b2;
 				WARNING_CFLAGS = "-Wall";
 			};
 			name = Debug;
@@ -566,7 +570,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				PRODUCT_VERSION = 1.4.2;
+				PRODUCT_VERSION = 1.5b2;
 				WARNING_CFLAGS = "-Wall";
 			};
 			name = Release;

Installer/Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string>com.github.rentzsch.clicktoflash</string>
+	<key>IFPkgFlagAllowBackRev</key>
+	<true/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>NoAuthorization</string>
+	<key>IFPkgFlagBackgroundAlignment</key>
+	<string>bottomright</string>
+	<key>IFPkgFlagBackgroundScaling</key>
+	<string>none</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/tmp</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagInstalledSize</key>
+	<integer>1440</integer>
+	<key>IFPkgFlagIsRequired</key>
+	<false/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string>NoRestart</string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+	<key>IFPkgFormatVersion</key>
+	<real>0.10000000149011612</real>
+</dict>
+</plist>

Installer/build_installer_pkg.command

@@ -0,0 +1,57 @@
+#!/bin/bash
+cd "`dirname \"$0\"`"
+SCRIPT_WD=`pwd`
+
+if [ -z "$PROJECT_DIR" ]; then
+	# Script invoked outside of Xcode, figure out environmental vars for ourself.
+	PROJECT_DIR='..'
+	BUILT_PRODUCTS_DIR="$PROJECT_DIR/build/Release"
+	BUILD_STYLE='Release'
+	BUILT_PLUGIN="$BUILT_PRODUCTS_DIR/ClickToFlash.webplugin"
+	PRODUCT_VERSION=`/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" "$BUILT_PLUGIN/Contents/Info.plist"`
+	SYSTEM_DEVELOPER_UTILITIES_DIR='/Developer/Applications/Utilities'
+fi
+
+if [ $BUILD_STYLE != "Release" ]; then
+	echo "Could not generate package."
+	echo "Active Configuration needs to be set to 'Release'."
+	exit 1
+fi
+
+MY_INSTALLER_ROOT="$BUILT_PRODUCTS_DIR/ClickToFlash.dst"
+BUILT_PLUGIN="$BUILT_PRODUCTS_DIR/ClickToFlash.webplugin"
+BUILT_PKG="$BUILT_PRODUCTS_DIR/ClickToFlash.pkg" # Sparkle currently can't handle -$VERSION in .pkg names.
+VERSIONED_NAME="ClickToFlash-$PRODUCT_VERSION"
+BUILT_ZIP="$BUILT_PRODUCTS_DIR/$VERSIONED_NAME.zip"
+
+# Delete old files if they're around.
+if [ -d "$MY_INSTALLER_ROOT" ]; then
+	rm -rf "$MY_INSTALLER_ROOT"
+fi
+if [ -d "$BUILT_PKG" ]; then
+	rm -rf "$BUILT_PKG"
+fi
+if [ -f "$BUILT_ZIP" ]; then
+	rm -rf "$BUILT_ZIP"
+fi
+
+# Create the .pkg.
+mkdir "$MY_INSTALLER_ROOT"
+cp -R "$BUILT_PLUGIN" "$MY_INSTALLER_ROOT"
+
+"$SYSTEM_DEVELOPER_UTILITIES_DIR/PackageMaker.app/Contents/MacOS/PackageMaker" \
+	--root "$BUILT_PRODUCTS_DIR/ClickToFlash.dst" \
+	--info Info.plist \
+	--resources resources \
+	--scripts scripts \
+	--target 10.4 \
+	--version "$PRODUCT_VERSION" \
+	--verbose \
+	--out "$BUILT_PKG"
+
+# Stuff it into a .zip.
+cd "$BUILT_PRODUCTS_DIR"
+zip -r "$VERSIONED_NAME.zip" "ClickToFlash.pkg"
+cd $SCRIPT_WD
+
+rm -rf "$MY_INSTALLER_ROOT"