Mercurial > rinkhals
changeset 344:1b35fceccaaa
Fixes.
author | Jeremy Thurgood <firxen@gmail.com> |
---|---|
date | Sat, 05 Sep 2009 23:04:40 +0000 |
parents | d7771ea76d33 |
children | 279974cc0698 |
files | darwin-py2app setup.py unix-tarball |
diffstat | 3 files changed, 25 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/darwin-py2app Sat Sep 05 23:01:11 2009 +0000 +++ b/darwin-py2app Sat Sep 05 23:04:40 2009 +0000 @@ -9,36 +9,37 @@ DMG_NAME="${BUILD_FOLDER}.dmg" PY2APP_LOG="py2app.log" -rm -rf "dist/tmp" -rm -rf "dist/${BUILD_FOLDER}" -rm -rf "dist/${ZIP_NAME}" +echo "=== Setting up build environment ===" -echo "" -echo "=== Copying dependencies that might not be installed ===" -echo "" +rm -rf build +mkdir build +mkdir dist -PGU_PATH=`find lib/pgu* -maxdepth 0 -type d` +for f in gamelib scripts data setup.py; do + svn export $f build/$f +done + +cd build -mkdir -p "dist/tmp/share/pgu/themes" -echo "'${PGU_PATH}/pgu' -> 'dist/tmp/'" -cp -R "${PGU_PATH}/pgu" "dist/tmp/" -echo "'${PGU_PATH}/data/themes/default' -> 'dist/tmp/share/pgu/themes/'" -cp -R "${PGU_PATH}/data/themes/default" "dist/tmp/share/pgu/themes/" +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 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 - -rm -rf "dist/tmp" +# python setup.py py2app >${PY2APP_LOG} 2>&1 +python setup.py py2app echo "" echo "=== Removing useless cruft that just takes up space ===" echo "" -find "dist/${BUILD_FOLDER}" -path '*/Resources/lib/*/data/*' -name '*.svg' -delete for dir in docs examples tests; do find "dist/${BUILD_FOLDER}" -path "*/Resources/lib/*/pygame/${dir}/*" -delete done @@ -47,6 +48,8 @@ echo "" hdiutil create -srcfolder dist/${BUILD_FOLDER}/*.app/ dist/${DMG_NAME} +mv dist/* ../dist/ +cd .. echo "" echo "=== Done ==="
--- a/setup.py Sat Sep 05 23:01:11 2009 +0000 +++ b/setup.py Sat Sep 05 23:04:40 2009 +0000 @@ -75,12 +75,13 @@ }, 'py2app': { 'argv_emulation': 1, + 'iconfile': 'data/icons/foxassault.icns', 'dist_dir': 'dist/foxassault-%s' % version.VERSION_STR, 'packages': [ - 'logging', 'encodings', 'pygame', 'gamelib', 'data', 'dist/tmp/pgu', + 'logging', 'encodings', 'pygame', 'pgu', 'gamelib', 'data', ], - 'resources': ['dist/tmp/share'], - 'excludes': ['numpy', 'pgu'], + 'resources': ['share'], + 'excludes': ['numpy'], }}, data_files = [ 'COPYRIGHT',
--- a/unix-tarball Sat Sep 05 23:01:11 2009 +0000 +++ b/unix-tarball Sat Sep 05 23:04:40 2009 +0000 @@ -17,6 +17,7 @@ rm -rf "${BUILD_FOLDER}" mkdir -p "${BUILD_FOLDER}" +mkdir -p dist # # Export source and then copy pgu to build folder @@ -57,8 +58,7 @@ cd build tar czf "foxassault-${OFA_VERSION}.tgz" "foxassault-${OFA_VERSION}" cd .. -cp "build/foxassault-${OFA_VERSION}.tgz" "${DIST_FILE}" -rm "build/foxassault-${OFA_VERSION}.tgz" +mv "build/foxassault-${OFA_VERSION}.tgz" "${DIST_FILE}" echo " Tar file: ${DIST_FILE}" echo " Build folder: ${BUILD_FOLDER}"