change ClickToFlash's extension to .webplugin; update package to accomodate new extension and to clean up after older plugins; activate GC support in both Sparkle and ClickToFlash

Signed-off-by: Jonathan 'Wolf' Rentzsch <[email protected]>

Author: Simone Manganelli

ClickToFlash.xcodeproj/project.pbxproj

@@ -128,7 +128,7 @@
 		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>"; };
 		55EB703D0E04A84F0016593D /* Plugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Plugin.m; path = Plugin/Plugin.m; sourceTree = "<group>"; };
-		55EB70420E04A8640016593D /* ClickToFlash.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ClickToFlash.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		55EB70420E04A8640016593D /* ClickToFlash.webplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ClickToFlash.webplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		55EB70560E04A8B80016593D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		55EB70570E04A8B80016593D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
 		55EB70610E04A8D00016593D /* Info-Plugin.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-Plugin.plist"; path = "Plugin/Info-Plugin.plist"; sourceTree = "<group>"; };
@@ -194,7 +194,7 @@
 		55EB70430E04A8640016593D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				55EB70420E04A8640016593D /* ClickToFlash.plugin */,
+				55EB70420E04A8640016593D /* ClickToFlash.webplugin */,
 				B5CFF1740F40EEDB005DB9CC /* Whitelist Panel Harness.app */,
 			);
 			name = Products;
@@ -291,7 +291,7 @@
 			);
 			name = ClickToFlash;
 			productName = ClickToFlash;
-			productReference = 55EB70420E04A8640016593D /* ClickToFlash.plugin */;
+			productReference = 55EB70420E04A8640016593D /* ClickToFlash.webplugin */;
 			productType = "com.apple.product-type.bundle";
 		};
 		B5CFF1730F40EEDB005DB9CC /* Whitelist Panel Harness */ = {
@@ -406,7 +406,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "rm -Rf \"$HOME/Library/Internet Plug-Ins/ClickToFlash.plugin\"\ncp -R \"$BUILT_PRODUCTS_DIR/ClickToFlash.plugin\" \"$HOME/Library/Internet Plug-Ins/ClickToFlash.plugin\"\nexit 0";
+			shellScript = "rm -Rf \"$HOME/Library/Internet Plug-Ins/ClickToFlash.plugin\"\nrm -Rf \"$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin\"\ncp -R \"$BUILT_PRODUCTS_DIR/ClickToFlash.plugin\" \"$HOME/Library/Internet Plug-Ins/ClickToFlash.plugin\"\nexit 0";
 		};
 		FADCD4210F421EAE00749805 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -542,6 +542,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_ENABLE_OBJC_GC = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -552,7 +553,7 @@
 				PRODUCT_NAME = ClickToFlash;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				VALID_ARCHS = "i386 ppc ppc7400 ppc970 x86_64";
-				WRAPPER_EXTENSION = plugin;
+				WRAPPER_EXTENSION = webplugin;
 				ZERO_LINK = NO;
 			};
 			name = Debug;
@@ -566,6 +567,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_GC = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -575,7 +577,7 @@
 				PRODUCT_NAME = ClickToFlash;
 				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				VALID_ARCHS = "i386 ppc ppc7400 ppc970 x86_64";
-				WRAPPER_EXTENSION = plugin;
+				WRAPPER_EXTENSION = webplugin;
 				ZERO_LINK = NO;
 			};
 			name = Release;

Package/Package Template.pmdoc/01clicktoflash-contents.xml

@@ -1 +1 @@
-<pkgref spec="1.12" uuid="3EB531D4-9A8B-4253-BCC3-2C37FD799BE1"><config><identifier>com.github.rentzsch.clicktoflash.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">../build/Release/ClickToFlash.plugin</installFrom><installTo mod="true">/tmp</installTo><flags><followSymbolicLinks/><overwriteDirectoryPermissions/><allowRevert/><mod>overwriteDirectoryPermissions</mod><mod>allowRevert</mod></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>installTo.isRelativeType</mod><mod>installFrom.isAbsoluteType</mod><mod>extraFiles</mod><mod>version</mod><mod>includeRoot</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>postInstall</mod><mod>scripts.preinstall.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.preinstall.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installFrom.path</mod></config><scripts><preinstall relative="true" mod="true">preflight.txt</preinstall><postinstall relative="true" mod="true">postflight.txt</postinstall></scripts><contents><file-list>01clicktoflash-contents.xml</file-list><component id="com.github.rentzsch.clicktoflash" path="/Users/simmy/clicktoflash+simX/build/Release/ClickToFlash.plugin" version="1.4fc6"><component id="org.andymatuschak.Sparkle" path="/Users/simmy/clicktoflash+simX/build/Release/ClickToFlash.plugin/Contents/Frameworks/Sparkle.framework" version="1.5"/></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
+<pkgref spec="1.12" uuid="3EB531D4-9A8B-4253-BCC3-2C37FD799BE1"><config><identifier>com.github.rentzsch.clicktoflash.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">../build/Release/ClickToFlash.webplugin</installFrom><installTo mod="true">/tmp</installTo><flags><followSymbolicLinks/><overwriteDirectoryPermissions/><allowRevert/><mod>overwriteDirectoryPermissions</mod><mod>allowRevert</mod></flags><packageStore type="internal"></packageStore><mod>installFrom.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>installTo.isRelativeType</mod><mod>installFrom.isAbsoluteType</mod><mod>extraFiles</mod><mod>version</mod><mod>includeRoot</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>postInstall</mod><mod>scripts.preinstall.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.preinstall.isRelativeType</mod><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.path</mod></config><scripts><preinstall relative="true" mod="true">preflight.txt</preinstall><postinstall relative="true" mod="true">postflight.txt</postinstall></scripts><contents><file-list>01clicktoflash-contents.xml</file-list><component id="com.github.rentzsch.clicktoflash" path="/Users/simmy/clicktoflash+simX/build/Release/ClickToFlash.webplugin" version="1.4fc6"><component id="org.andymatuschak.Sparkle" path="/Users/simmy/clicktoflash+simX/build/Release/ClickToFlash.webplugin/Contents/Frameworks/Sparkle.framework" version="1.5"/></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>

Package/Package Template.pmdoc/01clicktoflash.xml

@@ -1,5 +1,5 @@
-<pkmkdoc spec="1.12"><properties><title>ClickToFlash</title><build>/Users/simmy/clicktoflash+simX/Package/Package Template.pkg</build><organization>com.github.rentzsch.clicktoflash</organization><userSees ui="easy"/><min-target os="3"/><domain/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>ClickToFlash PackageMaker template.
+<pkmkdoc spec="1.12"><properties><title>ClickToFlash</title><build>/Users/simmy/clicktoflash+simX/Package/Package Template.pkg</build><organization>com.github.rentzsch.clicktoflash</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>ClickToFlash PackageMaker template.
 
 Make sure that you have the latest version of XCode when making changes as PackageMaker is generally a bit buggy. Use at least version 3.0.3.
 
-This package is currently configured to always install in $HOME. I didn't find a good way to let the user choose a system wide installation yet as we would always have to require admin rights.</description><contents><choice title="Internet Plug-Ins" id="clicktoflash" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.github.rentzsch.clicktoflash.pkg"/></choice></contents><resources bg-scale="none" bg-align="bottomright"><locale lang="en"><resource relative="true" mod="true" type="background">Background.png</resource><resource relative="true" mod="true" type="readme">Read Me Panel.rtf</resource><resource relative="true" mod="true" type="conclusion">Conclusion Panel.rtfd</resource></locale></resources><requirements><requirement id="sosv" operator="ge" value="'10.5.0'"><message-title>ClickToFlash requires MacOS X 10.5 Leopard</message-title><message>ClickToFlash cannot be used with the version of Mac OS X installed on your computer.</message></requirement><requirement id="moun" operator="eq" value="'/'"><message>This software can only be installed on the root volume.</message></requirement></requirements><flags/><extra-files/><item type="file">01clicktoflash.xml</item><mod>properties.userDomain</mod><mod>preinstallActions.actions</mod><mod>properties.systemDomain</mod><mod>properties.customizeOption</mod><mod>properties.anywhereDomain</mod><mod>extraFiles</mod><mod>properties.title</mod><mod>description</mod><mod>postinstallActions.actions</mod></pkmkdoc>
+This package is currently configured to always install in $HOME. I didn't find a good way to let the user choose a system wide installation yet as we would always have to require admin rights.</description><contents><choice title="Internet Plug-Ins" id="clicktoflash" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.github.rentzsch.clicktoflash.pkg"/></choice></contents><resources bg-scale="none" bg-align="bottomright"><locale lang="en"><resource relative="true" mod="true" type="background">Background.png</resource><resource relative="true" mod="true" type="readme">Read Me Panel.rtf</resource><resource relative="true" mod="true" type="conclusion">Conclusion Panel.rtfd</resource></locale></resources><requirements><requirement id="sosv" operator="ge" value="'10.5.0'"><message-title>ClickToFlash requires MacOS X 10.5 Leopard</message-title><message>ClickToFlash cannot be used with the version of Mac OS X installed on your computer.</message></requirement><requirement id="moun" operator="eq" value="'/'"><message>This software can only be installed on the root volume.</message></requirement></requirements><flags/><extra-files/><item type="file">01clicktoflash.xml</item><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod><mod>properties.customizeOption</mod><mod>preinstallActions.actions</mod><mod>extraFiles</mod><mod>properties.title</mod><mod>description</mod><mod>postinstallActions.actions</mod></pkmkdoc>

Package/Package Template.pmdoc/index.xml

@@ -1,7 +1,8 @@
 #!/bin/sh
 
 rm -rf "$HOME/Library/Internet Plug-Ins/ClickToFlash.plugin"
-mv /tmp/ClickToFlash.plugin "$HOME/Library/Internet Plug-Ins/"
+rm -rf "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin"
+mv /tmp/ClickToFlash.webplugin "$HOME/Library/Internet Plug-Ins/"
 pkgutil --forget com.github.rentzsch.clicktoflash.pkg
 
 exit 0

Package/postflight.txt

@@ -977,6 +977,7 @@
 			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH)";
+				GCC_ENABLE_OBJC_GC = supported;
 			};
 			name = Debug;
 		};
@@ -985,6 +986,7 @@
 			baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
 			buildSettings = {
 				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_ENABLE_OBJC_GC = supported;
 			};
 			name = Release;
 		};
@@ -1014,6 +1016,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */;
 			buildSettings = {
+				GCC_ENABLE_OBJC_GC = supported;
 				INSTALL_PATH = "@loader_path/../Frameworks";
 			};
 			name = "Release (GC dual-mode; 10.5-only)";