[gnue] r9838 - in trunk/gnue-forms/packaging/osx: . build-env/Resources

Author: johannes
Date: 2007-12-06 04:37:35 -0600 (Thu, 06 Dec 2007)
New Revision: 9838

Modified:
   trunk/gnue-forms/packaging/osx/build-env/Resources/postflight
   trunk/gnue-forms/packaging/osx/create-build.dist_template
   trunk/gnue-forms/packaging/osx/setup.py.dist_template
Log:
Make Packaging compatible with OS X 10.5


Modified: trunk/gnue-forms/packaging/osx/build-env/Resources/postflight
===================================================================
--- trunk/gnue-forms/packaging/osx/build-env/Resources/postflight	2007-12-05 09:52:03 UTC (rev 9837)
+++ trunk/gnue-forms/packaging/osx/build-env/Resources/postflight	2007-12-06 10:37:35 UTC (rev 9838)
@@ -4,8 +4,9 @@
 # Compile and optimize all python files of gnue
 #
 
-PYTHON=python2.3
-SITE=`$PYTHON -c "import site; print site.here"`
+PYTHON=python
+# python2.4+ has no site.here anymore
+SITE=`$PYTHON -c "import site, os.path; print os.path.dirname(site.__file__)"`
 COMPILE="$SITE/compileall.py"
 SITELIB="$SITE/site-packages/gnue/forms"
 

Modified: trunk/gnue-forms/packaging/osx/create-build.dist_template
===================================================================
--- trunk/gnue-forms/packaging/osx/create-build.dist_template	2007-12-05 09:52:03 UTC (rev 9837)
+++ trunk/gnue-forms/packaging/osx/create-build.dist_template	2007-12-06 10:37:35 UTC (rev 9838)
@@ -24,14 +24,28 @@
   exit 1
 fi
 
+pkgmaker=/Developer/Tools/packagemaker
+if [ ! -x $pkgmaker ];
+then
+  pkgmaker=/Developer/usr/bin/packagemaker
+fi
+
+if [ ! -x $pkgmaker ];
+then
+  echo "No packagemaker binary found"
+  exit 1
+fi
+
 # ---------------------------------------------------------------------------
 # Get the package-name and version from the PKG-INFO file
 # ---------------------------------------------------------------------------
 
-volname=":PACKAGE:-:VERSION:-py23"
-package=":PACKAGE:-py23.pkg"
+pyver=`python -c "import sys; print sys.version[:3].replace('.', '')"`
 
+volname=":PACKAGE:-:VERSION:-py$pyver"
+package=":PACKAGE:-py$pyver.pkg"
 
+
 # ---------------------------------------------------------------------------
 # Populate the package environment
 # ---------------------------------------------------------------------------
@@ -103,7 +117,7 @@
 cd $curdir
 
 echo "Building the package ..."
-/Developer/Tools/packagemaker -build -p $package -f $destdir -ds -r $resdir -i Info.plist -d Description.plist
+$pkgmaker -build -p $package -f $destdir -ds -r $resdir -i Info.plist -d Description.plist
 
 
 # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/packaging/osx/setup.py.dist_template
===================================================================
--- trunk/gnue-forms/packaging/osx/setup.py.dist_template	2007-12-05 09:52:03 UTC (rev 9837)
+++ trunk/gnue-forms/packaging/osx/setup.py.dist_template	2007-12-06 10:37:35 UTC (rev 9838)
@@ -13,6 +13,7 @@
         iconfile='forms.icns',
         site_packages=True,
         argv_emulation=True,
+        semi_standalone=True,
         excludes=['gnue'],
         dist_dir='build-env/pkg-root/Applications',
         bdist_base='build-pyapp',