From e1688f660540b68fc77e91e4524bd54045ef8245 Mon Sep 17 00:00:00 2001 From: Simone Manganelli Date: Tue, 5 May 2009 11:27:53 +0800 Subject: [PATCH] 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 --- ClickToFlash.xcodeproj/project.pbxproj | 14 ++++++++------ .../01clicktoflash-contents.xml | 2 +- Package/Package Template.pmdoc/01clicktoflash.xml | 2 +- Package/Package Template.pmdoc/index.xml | 4 ++-- Package/postflight.txt | 3 ++- Sparkle/Sparkle.xcodeproj/project.pbxproj | 3 +++ 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ClickToFlash.xcodeproj/project.pbxproj b/ClickToFlash.xcodeproj/project.pbxproj index abdda53b..52d93651 100644 --- a/ClickToFlash.xcodeproj/project.pbxproj +++ b/ClickToFlash.xcodeproj/project.pbxproj @@ -128,7 +128,7 @@ 072189BD0F30D9C3008C8944 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Plugin/English.lproj/WhitelistPanel.xib; sourceTree = ""; }; 55EB703C0E04A84F0016593D /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = Plugin/Plugin.h; sourceTree = ""; }; 55EB703D0E04A84F0016593D /* Plugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Plugin.m; path = Plugin/Plugin.m; sourceTree = ""; }; - 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 = ""; }; 55EB70570E04A8B80016593D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; 55EB70610E04A8D00016593D /* Info-Plugin.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-Plugin.plist"; path = "Plugin/Info-Plugin.plist"; sourceTree = ""; }; @@ -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; diff --git a/Package/Package Template.pmdoc/01clicktoflash-contents.xml b/Package/Package Template.pmdoc/01clicktoflash-contents.xml index 4ce7cccb..2dc8f07b 100644 --- a/Package/Package Template.pmdoc/01clicktoflash-contents.xml +++ b/Package/Package Template.pmdoc/01clicktoflash-contents.xml @@ -1 +1 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file +modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/Package/Package Template.pmdoc/01clicktoflash.xml b/Package/Package Template.pmdoc/01clicktoflash.xml index 8405b86f..da6b8e48 100644 --- a/Package/Package Template.pmdoc/01clicktoflash.xml +++ b/Package/Package Template.pmdoc/01clicktoflash.xml @@ -1 +1 @@ -com.github.rentzsch.clicktoflash.pkg1../build/Release/ClickToFlash.plugin/tmpoverwriteDirectoryPermissionsallowRevertinstallToscripts.scriptsDirectoryPath.isRelativeTypeinstallTo.isAbsoluteTypeinstallTo.isRelativeTypeinstallFrom.isAbsoluteTypeextraFilesversionincludeRootidentifierparentscripts.postinstall.pathrequireAuthorizationpostInstallscripts.preinstall.pathrelocatableinstallFrom.isRelativeTypeinstallTo.pathscripts.preinstall.isRelativeTypescripts.scriptsDirectoryPath.pathinstallFrom.pathpreflight.txtpostflight.txt01clicktoflash-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +com.github.rentzsch.clicktoflash.pkg1../build/Release/ClickToFlash.webplugin/tmpoverwriteDirectoryPermissionsallowRevertinstallFrom.pathscripts.scriptsDirectoryPath.isRelativeTypeinstallTo.isAbsoluteTypeinstallTo.isRelativeTypeinstallFrom.isAbsoluteTypeextraFilesversionincludeRootidentifierparentscripts.postinstall.pathrequireAuthorizationpostInstallscripts.preinstall.pathrelocatableinstallFrom.isRelativeTypeinstallTo.pathscripts.preinstall.isRelativeTypeinstallToscripts.scriptsDirectoryPath.pathpreflight.txtpostflight.txt01clicktoflash-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/Package/Package Template.pmdoc/index.xml b/Package/Package Template.pmdoc/index.xml index cad72d2b..10ce5a75 100644 --- a/Package/Package Template.pmdoc/index.xml +++ b/Package/Package Template.pmdoc/index.xml @@ -1,5 +1,5 @@ -ClickToFlash/Users/simmy/clicktoflash+simX/Package/Package Template.pkgcom.github.rentzsch.clicktoflashClickToFlash PackageMaker template. +ClickToFlash/Users/simmy/clicktoflash+simX/Package/Package Template.pkgcom.github.rentzsch.clicktoflashClickToFlash 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.Background.pngRead Me Panel.rtfConclusion Panel.rtfdClickToFlash requires MacOS X 10.5 LeopardClickToFlash cannot be used with the version of Mac OS X installed on your computer.This software can only be installed on the root volume.01clicktoflash.xmlproperties.userDomainpreinstallActions.actionsproperties.systemDomainproperties.customizeOptionproperties.anywhereDomainextraFilesproperties.titledescriptionpostinstallActions.actions \ No newline at end of file +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.Background.pngRead Me Panel.rtfConclusion Panel.rtfdClickToFlash requires MacOS X 10.5 LeopardClickToFlash cannot be used with the version of Mac OS X installed on your computer.This software can only be installed on the root volume.01clicktoflash.xmlproperties.userDomainproperties.anywhereDomainproperties.systemDomainproperties.customizeOptionpreinstallActions.actionsextraFilesproperties.titledescriptionpostinstallActions.actions \ No newline at end of file diff --git a/Package/postflight.txt b/Package/postflight.txt index 6af2ed37..4c106538 100644 --- a/Package/postflight.txt +++ b/Package/postflight.txt @@ -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 \ No newline at end of file diff --git a/Sparkle/Sparkle.xcodeproj/project.pbxproj b/Sparkle/Sparkle.xcodeproj/project.pbxproj index d0ac9ddf..ff60c203 100644 --- a/Sparkle/Sparkle.xcodeproj/project.pbxproj +++ b/Sparkle/Sparkle.xcodeproj/project.pbxproj @@ -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)";