Changeset 355:4cbc1ff98a2c

Timestamp:

Sep 5, 2009, 11:50:37 PM (11 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Convert:

svn:b4e93282-eac8-4b8b-b765-0f5d36de2b68@356

Message:

Mac OS X packaging happy.

Files:

• TODO (modified) (1 diff)
• darwin-py2app (modified) (4 diffs)
• setup.py (modified) (1 diff)

TODO

@@ -1 +1 @@
 == TODO ==
-
-* Py2app packaging (jerith)
-* Add icons to py2app build.
 
 == POST PYWEEK ==

darwin-py2app

@@ -6 +6 @@
 
 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 ""
@@ -34 +30 @@
 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 ""
@@ -42 +37 @@
 
 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
 
@@ -48 +43 @@
 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 ""

setup.py

@@ -77 +77 @@
                 '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'],
             }},