Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/simX/clicktoflash
Browse files Browse the repository at this point in the history
  • Loading branch information
nevali committed Aug 23, 2009
2 parents 3265bb5 + d870653 commit b869112
Show file tree
Hide file tree
Showing 16 changed files with 249 additions and 1,680 deletions.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Installer/Distribution Template.pmdoc/01clicktoflash.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<pkgref spec="1.12" uuid="3EB531D4-9A8B-4253-BCC3-2C37FD799BE1"><config><identifier>com.github.rentzsch.clicktoflash.admin.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><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>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.preflight.path</mod><mod>scripts.preinstall.path</mod><mod>scripts.postflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installTo.path</mod><mod>scripts.preinstall.isRelativeType</mod><mod>installFrom.path</mod></config><scripts><preflight relative="true" mod="true">../Installer/scripts/preflight</preflight><postflight relative="true" mod="true">../Installer/scripts/postflight</postflight></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.5b5"><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>

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Installer/Distribution Template.pmdoc/02clicktoflash.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<pkgref spec="1.12" uuid="D571108E-19BB-4264-978A-9C39291AA7B6"><config><identifier>com.github.rentzsch.clicktoflash.nonadmin.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/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>installTo</mod><mod>scripts.preflight.path</mod><mod>scripts.postflight.path</mod><mod>scripts.preinstall.path</mod><mod>includeRoot</mod><mod>installTo.path</mod><mod>identifier</mod><mod>installFrom.path</mod></config><scripts><preflight relative="true" mod="true">../Installer/scripts/preflight</preflight><postflight relative="true" mod="true">../Installer/scripts/postflight</postflight></scripts><contents><file-list>02clicktoflash-contents.xml</file-list><component id="com.github.rentzsch.clicktoflash" path="/Users/simmy/clicktoflash+simX/build/Release/ClickToFlash.webplugin" version="1.5b5"><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></pkgref>
5 changes: 5 additions & 0 deletions Installer/Distribution Template.pmdoc/index.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<pkmkdoc spec="1.12"><properties><title>ClickToFlash</title><build>/Users/simmy/clicktoflash+simX/Package/Package Template.mpkg</build><organization>com.github.rentzsch.clicktoflash.pkg</organization><userSees ui="easy"/><min-target os="2"/><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="ClickToFlash-admin" id="clicktoflashadmin" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.github.rentzsch.clicktoflash.admin.pkg"/><choice-reqs><requirement id="scri" operator="eq" value="true" selected="no" enabled="no" hidden="no" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>admin_privs_needed.command</file></requirement></choice-reqs></choice><choice title="ClickToFlash-nonadmin" id="clicktoflashnonadmin" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.github.rentzsch.clicktoflash.nonadmin.pkg"/><choice-reqs><requirement id="scri" operator="eq" value="true" selected="no" enabled="no" hidden="no" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>no_admin_privs_needed.command</file></requirement></choice-reqs></choice></contents><resources bg-scale="none" bg-align="bottomright"><locale lang="en"><resource relative="true" mod="true" type="background">../Installer/resources/en.lproj/Background.tiff</resource><resource relative="true" mod="true" type="readme">../Installer/resources/en.lproj/ReadMe.rtf</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><item type="file">02clicktoflash.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>
40 changes: 40 additions & 0 deletions Installer/Info-admin.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//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.admin.pkg</string>
<key>CFBundleShortVersionString</key>
<string>1</string>
<key>IFMajorVersion</key>
<integer>1</integer>
<key>IFMinorVersion</key>
<integer>0</integer>
<key>IFPkgFlagAllowBackRev</key>
<true/>
<key>IFPkgFlagAuthorizationAction</key>
<string>RootAuthorization</string>
<key>IFPkgFlagDefaultLocation</key>
<string>/tmp</string>
<key>IFPkgFlagFollowLinks</key>
<true/>
<key>IFPkgFlagInstallFat</key>
<false/>
<key>IFPkgFlagInstalledSize</key>
<integer>1736</integer>
<key>IFPkgFlagIsRequired</key>
<false/>
<key>IFPkgFlagOverwritePermissions</key>
<false/>
<key>IFPkgFlagRelocatable</key>
<false/>
<key>IFPkgFlagRestartAction</key>
<string>None</string>
<key>IFPkgFlagRootVolumeOnly</key>
<false/>
<key>IFPkgFlagUpdateInstalledLanguages</key>
<false/>
<key>IFPkgFormatVersion</key>
<real>0.1000000014901161</real>
</dict>
</plist>
File renamed without changes.
Loading

0 comments on commit b869112

Please sign in to comment.