# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1252194637 0
# Node ID 4cbc1ff98a2c0d97eb540af14717bdc921863df1
# Parent  e244f259be2b67ac0dc48f47f202bb4b2165404a
Mac OS X packaging happy.

diff -r e244f259be2b -r 4cbc1ff98a2c TODO
--- a/TODO	Sat Sep 05 23:48:31 2009 +0000
+++ b/TODO	Sat Sep 05 23:50:37 2009 +0000
@@ -1,8 +1,5 @@
 == TODO ==
 
-* Py2app packaging (jerith)
-* Add icons to py2app build.
-
 == POST PYWEEK ==
 
 * Add invalid cursor sprite
diff -r e244f259be2b -r 4cbc1ff98a2c darwin-py2app
--- a/darwin-py2app	Sat Sep 05 23:48:31 2009 +0000
+++ b/darwin-py2app	Sat Sep 05 23:50:37 2009 +0000
@@ -5,51 +5,47 @@
 # Usage: darwin-py2app
 
 OFA_VERSION=`PYTHONPATH=. python -c "from gamelib import version; print version.VERSION_STR"`
-BUILD_FOLDER="foxassault-${OFA_VERSION}"
-DMG_NAME="${BUILD_FOLDER}.dmg"
+BUILD_NAME="foxassault-${OFA_VERSION}"
+BUILD_FOLDER="build/${BUILD_NAME}"
+DMG_NAME="${BUILD_NAME}.dmg"
 PY2APP_LOG="py2app.log"
 
+BASEDIR=`pwd`
+
 echo "=== Setting up build environment ==="
 
-rm -rf build
-mkdir build
-mkdir dist
+./unix-tarball
 
-for f in gamelib scripts data setup.py; do
-    svn export $f build/$f
+for f in scripts setup.py; do
+    svn export $f ${BUILD_FOLDER}/$f
 done
 
-cd build
+cd ${BUILD_FOLDER}
 
-unzip ../lib/pgu-*.zip
-mv pgu-*/pgu .
-mkdir -p share/pgu
-mv pgu-*/data/themes share/pgu
-rm -rf pgu-*
-find data -name '*.svg' -delete
+# find data -name '*.svg' -delete
 
 echo ""
 echo "=== Running python setup.py ==="
 echo "  Fox Assault version: ${OFA_VERSION}"
 echo "  Writing log to ${PY2APP_LOG}"
 
-# python setup.py py2app >${PY2APP_LOG} 2>&1
-python setup.py py2app
+python setup.py py2app >${PY2APP_LOG} 2>&1
 
 echo ""
 echo "=== Removing useless cruft that just takes up space ==="
 echo ""
 
 for dir in docs examples tests; do
-    find "dist/${BUILD_FOLDER}" -path "*/Resources/lib/*/pygame/${dir}/*" -delete
+    find "dist/" -path "*/Resources/lib/*/pygame/${dir}/*" -delete
 done
 
 echo "=== Building DMG ==="
 echo ""
 
-hdiutil create -srcfolder dist/${BUILD_FOLDER}/*.app/ dist/${DMG_NAME}
-mv dist/* ../dist/
-cd ..
+cd ${BASEDIR}
+
+pwd
+hdiutil create -srcfolder ${BUILD_FOLDER}/dist/*.app/ dist/${DMG_NAME}
 
 echo ""
 echo "=== Done ==="
diff -r e244f259be2b -r 4cbc1ff98a2c setup.py
--- a/setup.py	Sat Sep 05 23:48:31 2009 +0000
+++ b/setup.py	Sat Sep 05 23:50:37 2009 +0000
@@ -76,11 +76,11 @@
             'py2app': {
                 'argv_emulation': 1,
                 'iconfile': 'data/icons/foxassault.icns',
-                'dist_dir': 'dist/foxassault-%s' % version.VERSION_STR,
+#                 'dist_dir': 'dist/foxassault-%s' % version.VERSION_STR,
+#                 'bdist_base': 'build/bdist',
                 'packages': [
                     'logging', 'encodings', 'pygame', 'pgu', 'gamelib', 'data',
                 ],
-                'resources': ['share'],
                 'excludes': ['numpy'],
             }},
             data_files = [