Author: johannes
Date: 2007-05-29 04:51:08 -0500 (Tue, 29 May 2007)
New Revision: 9637
Added:
trunk/gnue-common/packaging/osx/Info.plist.in
Modified:
trunk/gnue-common/MANIFEST.in
trunk/gnue-common/packaging/osx/Info.plist
trunk/gnue-common/utils/update-py2app.sh
Log:
More work on OS X packaging
Modified: trunk/gnue-common/MANIFEST.in
===================================================================
--- trunk/gnue-common/MANIFEST.in 2007-05-29 08:31:35 UTC (rev 9636)
+++ trunk/gnue-common/MANIFEST.in 2007-05-29 09:51:08 UTC (rev 9637)
@@ -19,6 +19,7 @@
include packaging/debian/*
include packaging/fink/*
include packaging/osx/*
+exclude packaging/osx/*.in
include packaging/osx/build-env/Resources/*
include packaging/win32/*
Modified: trunk/gnue-common/packaging/osx/Info.plist
===================================================================
--- trunk/gnue-common/packaging/osx/Info.plist 2007-05-29 08:31:35 UTC (rev 9636)
+++ trunk/gnue-common/packaging/osx/Info.plist 2007-05-29 09:51:08 UTC (rev 9637)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>0.6.8, GNUe (c) 2001-2007 Free Software Foundation</string>
+ <string>0.6.8+svn.9614, GNUe (c) 2001-2007 Free Software Foundation</string>
<key>CFBundleIdentifier</key>
<string>org.gnuenterprise.common</string>
<key>CFBundleShortVersionString</key>
Added: trunk/gnue-common/packaging/osx/Info.plist.in
===================================================================
--- trunk/gnue-common/packaging/osx/Info.plist.in 2007-05-29 08:31:35 UTC (rev 9636)
+++ trunk/gnue-common/packaging/osx/Info.plist.in 2007-05-29 09:51:08 UTC (rev 9637)
@@ -0,0 +1,46 @@
+<?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>CFBundleGetInfoString</key>
+ <string>::GNUe-Version::, GNUe (c) 2001-2007 Free Software Foundation</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.gnuenterprise.common</string>
+ <key>CFBundleShortVersionString</key>
+ <string>::GNUe-ShortVersion::</string>
+ <key>IFMajorVersion</key>
+ <integer>0</integer>
+ <key>IFMinorVersion</key>
+ <integer>6</integer>
+ <key>IFPkgFlagAllowBackRev</key>
+ <false/>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>AdminAuthorization</string>
+ <key>IFPkgFlagBackgroundAlignment</key>
+ <string>topleft</string>
+ <key>IFPkgFlagBackgroundScaling</key>
+ <string>none</string>
+ <key>IFPkgFlagDefaultLocation</key>
+ <string>/</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagInstallFat</key>
+ <false/>
+ <key>IFPkgFlagInstalledSize</key>
+ <integer>4060</integer>
+ <key>IFPkgFlagIsRequired</key>
+ <false/>
+ <key>IFPkgFlagOverwritePermissions</key>
+ <false/>
+ <key>IFPkgFlagRelocatable</key>
+ <false/>
+ <key>IFPkgFlagRestartAction</key>
+ <string>NoRestart</string>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <false/>
+ <key>IFPkgFlagUpdateInstalledLanguages</key>
+ <false/>
+ <key>IFPkgFormatVersion</key>
+ <real>0.10000000149011612</real>
+</dict>
+</plist>
Modified: trunk/gnue-common/utils/update-py2app.sh
===================================================================
--- trunk/gnue-common/utils/update-py2app.sh 2007-05-29 08:31:35 UTC (rev 9636)
+++ trunk/gnue-common/utils/update-py2app.sh 2007-05-29 09:51:08 UTC (rev 9637)
@@ -1,18 +1,34 @@
-#!/bin/sh
+#!/bin/bash
# Update the py2app-setup.py file
#
# run from within the package directory
+phase=$(echo "import src; print src.version.phase" | gcvs)
+version=$(echo "import src; print src.version.get_version()" | gcvs)
major=$(echo "import src; print src.version.major" | gcvs)
-version=$(echo "import src; print src.version.get_version()" | gcvs)
minor=$(echo "import src; print src.version.minor" | gcvs)
+build=$(echo "import src; print src.version.build" | gcvs)
title=$(echo "import src; print src.TITLE" | gcvs)
-# Update the setup script for py2app
+if [ "$phase" == "final" ]; then
+ short="$major.$minor.$build"
+else
+ # TODO: what should be used as third number if we are not going to package
+ # final release
+ short="$major.$minor.0"
+fi
+
+# If there is a setup.py for py2app update some version information
file="packaging/osx/setup.py"
+if [ -f "$file" ]; then
+ sed -i "s/^app_name =.*$/app_name = '$title'/" $file
+ sed -i "s/^app_vers =.*$/app_vers = '$version'/" $file
+ sed -i "s/^short_vers =.*$/short_vers = '$short'/" $file
+fi
-sed -i "s/^app_name =.*$/app_name = '$title'/" $file
-sed -i "s/^app_vers =.*$/app_vers = '$version'/" $file
-sed -i "s/^short_vers =.*$/short_vers= '$major.$minor.0'/" $file
+# Update the info property list for the installer package
+plist="packaging/osx/Info.plist"
+cp "$plist.in" $plist
-# TODO: Update the Info.plist too
+sed -i "s/::GNUe-Version::/$version/" $plist
+sed -i "s/::GNUe-ShortVersion::/$short/" $plist
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.