Removed version numbering from installer package internal identifier

diff --git a/OS X 10.5+ PCRE.pmdoc/01pkg.xml b/OS X 10.5+ PCRE.pmdoc/01pkg.xml
index e595c3b..798609d 100644 (file)
--- a/OS X 10.5+ PCRE.pmdoc/01pkg.xml
+++ b/OS X 10.5+ PCRE.pmdoc/01pkg.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="357217A6-2803-4333-A485-F57AD6D7F306"><config><identifier>org.ijbswa.privoxy3.0.19.pkg</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom relative="true">pkg content</installFrom><installTo>/</installTo><flags><followSymbolicLinks/><discardResourceForks/><mod>discardResourceForks</mod></flags><packageStore type="internal"/><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>identifier</mod><mod>parent</mod></config><scripts><scripts-dir mod="true">/Users/yan/code/Privoxy/OSXPackageBuilder/pkg resources/single-binary scripts</scripts-dir></scripts><contents><file-list>01pkg-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="357217A6-2803-4333-A485-F57AD6D7F306"><config><identifier>org.ijbswa.privoxy.pkg</identifier><version>3.0.20</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">pkg content</installFrom><installTo>/</installTo><flags><followSymbolicLinks/><discardResourceForks/><mod>discardResourceForks</mod></flags><packageStore type="internal"></packageStore><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod></config><scripts><scripts-dir mod="true">/Users/yan/code/Privoxy/OSXPackageBuilder/pkg resources/single-binary scripts</scripts-dir></scripts><contents><file-list>01pkg-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file

diff --git a/OS X 10.5+ PCRE.pmdoc/index.xml b/OS X 10.5+ PCRE.pmdoc/index.xml
index 3188104..b20b4da 100644 (file)
--- a/OS X 10.5+ PCRE.pmdoc/index.xml
+++ b/OS X 10.5+ PCRE.pmdoc/index.xml
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Privoxy 3.0.19</title><build>/Users/yan/code/Privoxy/Privoxy 3.0.19 PCRE.pkg</build><organization>org.ijbswa.privoxy</organization><userSees ui="easy"/><min-target os="3"/><domain/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="pkg content" id="choice25" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.ijbswa.privoxy3.0.19.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">../current/LICENSE</resource><resource relative="true" mod="true" type="readme">pkg resources/interface texts/ReadMe.txt</resource><resource relative="true" mod="true" type="welcome">pkg resources/interface texts/Introduction.txt</resource><resource relative="true" mod="true" type="conclusion">pkg resources/interface texts/Finish Up.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.5'"><message-title>Failure</message-title><message>OS X 10.5 or higher required.</message></requirement></requirements><flags/><extra-files/><item type="file">01pkg.xml</item><mod>extraFiles</mod><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file
+<pkmkdoc spec="1.12"><properties><title>Privoxy</title><build>/Users/yan/code/Privoxy/builds/Privoxy 3.0.20 PCRE.pkg</build><organization>org.ijbswa.privoxy</organization><userSees ui="easy"/><min-target os="3"/><domain/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="pkg content" id="choice25" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.ijbswa.privoxy.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">../current/LICENSE</resource><resource relative="true" mod="true" type="readme">pkg resources/interface texts/ReadMe.txt</resource><resource relative="true" mod="true" type="welcome">pkg resources/interface texts/Introduction.txt</resource><resource relative="true" mod="true" type="conclusion">pkg resources/interface texts/Finish Up.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.5'"><message-title>Failure</message-title><message>OS X 10.5 or higher required.</message></requirement></requirements><flags/><extra-files/><item type="file">01pkg.xml</item><mod>extraFiles</mod><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file

diff --git a/OS X Package Builder HOWTO.txt b/OS X Package Builder HOWTO.txt
index 1179bd2..ace0b82 100644 (file)
--- a/OS X Package Builder HOWTO.txt
+++ b/OS X Package Builder HOWTO.txt
@@ -64,13 +64,8 @@ Three different Packagemaker project files are supplied, though the procedure is
 - OS X 10.5+.pmdoc - if you are using the bundled PCRE library.
 - OS X 10.4.pmdoc - for Tiger builds with the bundled PCRE library.
 
-Refer to the separate document "Packagemaker Instructions.txt" for complete instructions, however the following covers the list of mandatory changes to make per release:
+Refer to the separate document "Packagemaker Instructions.txt" for complete instructions, however the following item is all that needs to be changed if you are building a package for a newer version of Privoxy:
 
-'Distribution left-menu item>Configuration>Title'
-'pkg content left-menu item>pkg content>Configuration>Package Identifier'
-
-Navigate to 'pkg content left-menu item>pkg content>Scripts'
-
-and drag and drop the directory 'pkg resources/single-binary scripts' from your file browser (e.g. Finder) into the 'Scripts directory' entry box. This MUST be left as an 'absolute' path due to a bug in PackageMaker; if you select 'relative to project' then the scripts will not be found nor added to the package at build time.
+'pkg content left-menu item>pkg content>Configuration>Package Version'
 
 Finally click the 'Build' button at screen top-left. The package filename is up to you but I recommend "Privoxy <version>.pkg", e.g. "Privoxy 3.0.19.pkg". For the down-level release I have used "Privoxy <version> OS X 10.4.mpkg"
\ No newline at end of file

diff --git a/Packagemaker Instructions.txt b/Packagemaker Instructions.txt
index 44bf698..11056c4 100644 (file)
--- a/Packagemaker Instructions.txt
+++ b/Packagemaker Instructions.txt
@@ -52,8 +52,8 @@ Package: pkg content Configuration
 
 Destination is /
 No custom location
-The Package Identifier _MUST_ be in the form: 'org.ijbswa.privoxyX.Y.ZZ.pkg' where X.Y.ZZ is the release version (e.g. 3.0.19). This is important since the uninstall.command script is populated with this name by a separate process.
-Package Version is irrelevant.
+The Package Identifier _MUST_ be: 'org.ijbswa.privoxy.pkg'. This is important since the uninstall.command script references this identifier.
+Package Version should match the version of Privoxy being built.
 Restart Action: None
 Require admin authentication should be ticked.
 Open the Package Flags window (Package>Package Flags...) and tick Discard Resource Forks.

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index fb5576a..b7da5fd 100755 (executable)
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -46,13 +46,6 @@ echo "Copy the package skeleton (the unchanging content) to a new folder named '
 echo ""
 cp -vR pkg\ content\ skeleton pkg\ content
 
-# Replace the version number placeholders in the uninstallation script
-echo ""
-echo "Replace the version number placeholders in the uninstallation script"
-echo ""
-VERSION=`perl findversion.pl ../${SOURCE_DIR}/ChangeLog`
-sed "s/PRIVOXY_VERSION/${VERSION}/g" pkg\ content\ skeleton/Applications/Privoxy/uninstall.command > pkg\ content/Applications/Privoxy/uninstall.command
-
 # Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory
 echo ""
 echo ""

diff --git a/pkg content skeleton/Applications/Privoxy/uninstall.command b/pkg content skeleton/Applications/Privoxy/uninstall.command
index 76054ac..a237fe1 100755 (executable)
--- a/pkg content skeleton/Applications/Privoxy/uninstall.command
+++ b/pkg content skeleton/Applications/Privoxy/uninstall.command
@@ -72,9 +72,9 @@ if [ "$UID" -eq "$root_UID" ]; then
                        echo 'Delete package installation receipt (ignore errors relating to other bundle identifiers).'
                        # On OS X 10.5 or newer we can use the new pkgutil command else simply delete the receipt file
                        if [ -x /usr/sbin/pkgutil ]; then
-                               pkgutil --forget org.ijbswa.privoxyPRIVOXY_VERSION.pkg
+                               pkgutil --forget org.ijbswa.privoxy.pkg
                        else
-                               rm -rf /Library/Receipts/Privoxy\ PRIVOXY_VERSION\ OS\ X\ 10.4.pkg
+                               rm -rf /Library/Receipts/Privoxy\ OS\ X\ 10.4.pkg
                        fi
 
                        # Check the Trash, just in case the user manually removed the only obvious item from /Applications