Permalink
Browse files

resolving merge conflict

  • Loading branch information...
2 parents 75e6c64 + 842dd35 commit 4a239f7574d0cd6148d52dda26deb882fb98aee5 Simone Manganelli committed May 29, 2009
@@ -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;
View
@@ -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>
@@ -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"
Binary file not shown.
File renamed without changes.
File renamed without changes.
View
No changes.
View
No changes.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Deleted file not rendered
Deleted file not rendered
@@ -1,23 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh8400\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li140\qc\pardirnatural
-
-\f0\b\fs30 \cf0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\b0\fs24 \cf0 {{\NeXTGraphic Success.png \width1280 \height1260
-}�}\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-\cf0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\b\fs32 \cf0 \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li140\qc\pardirnatural
-
-\fs48 \cf0 Install Succeeded
-\b0\fs24 \
-
-\fs16 \
-
-\fs28 Quit and relaunch Safari to activate ClickToFlash}
Oops, something went wrong.
@@ -1 +0,0 @@
-<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>
@@ -1,5 +0,0 @@
-<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>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>
View
0 Plugin/CTFWhitelist.m 100755 → 100644
No changes.
View
0 Plugin/CTFsIFRSupport.m 100755 → 100644
No changes.
Oops, something went wrong.

0 comments on commit 4a239f7

Please sign in to comment.