changeset 577:62666b542afe

Fixed MacOS X packaging, updated .hgignore.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 10 Apr 2011 13:59:30 +0200
parents 0dfb62814de6
children 2e181628d0be
files .hgignore scripts/build_unix.sh scripts/darwin-py2app.sh scripts/wine-py2exe setup.py
diffstat 5 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sun Apr 10 10:37:31 2011 +0200
+++ b/.hgignore	Sun Apr 10 13:59:30 2011 +0200
@@ -4,6 +4,6 @@
 /\._[^/]*$
 /\.~lock\..*#$
 /\.DS_Store$
-^dist/$
-^build/$
+^dist/
+^build/
 ^.*\.egg-info/$
--- a/scripts/build_unix.sh	Sun Apr 10 10:37:31 2011 +0200
+++ b/scripts/build_unix.sh	Sun Apr 10 13:59:30 2011 +0200
@@ -2,7 +2,7 @@
 
 GAME_NAME="nine-tails"
 
-NT_VERSION=`sed -nre 's/VERSION_STR = "(.*)"/\1/p' setup.py`
+NT_VERSION=`sed -ne 's/VERSION_STR = "\(.*\)"/\1/p' setup.py`
 BUILD_NAME="${GAME_NAME}-${NT_VERSION}"
 BUILD_FOLDER="build/${GAME_NAME}"
 TARBALL_NAME="${BUILD_NAME}.tgz"
--- a/scripts/darwin-py2app.sh	Sun Apr 10 10:37:31 2011 +0200
+++ b/scripts/darwin-py2app.sh	Sun Apr 10 13:59:30 2011 +0200
@@ -6,7 +6,7 @@
 
 GAME_NAME="nine-tails"
 
-NT_VERSION=`sed -nre 's/VERSION_STR = "(.*)"/\1/p' setup.py`
+NT_VERSION=`sed -ne 's/VERSION_STR = "\(.*\)"/\1/p' setup.py`
 BUILD_NAME="${GAME_NAME}-${NT_VERSION}"
 BUILD_FOLDER="build/${GAME_NAME}"
 DMG_NAME="${BUILD_NAME}.dmg"
@@ -17,6 +17,7 @@
 echo "=== Setting up build environment ==="
 
 ./scripts/build_unix.sh
+cp run_game.py ${BUILD_FOLDER}
 
 cd ${BUILD_FOLDER}
 
--- a/scripts/wine-py2exe	Sun Apr 10 10:37:31 2011 +0200
+++ b/scripts/wine-py2exe	Sun Apr 10 13:59:30 2011 +0200
@@ -4,7 +4,7 @@
 #
 # Usage: wine-py2exe
 
-NT_VERSION=`sed -nre 's/VERSION_STR = "(.*)"/\1/p' setup.py`
+NT_VERSION=`sed -ne 's/VERSION_STR = "\(.*\)"/\1/p' setup.py`
 BUILD_FOLDER="nine-tails-${NT_VERSION}"
 ZIP_NAME="${BUILD_FOLDER}.zip"
 PY2EXE_LOG="py2exe.log"
--- a/setup.py	Sun Apr 10 10:37:31 2011 +0200
+++ b/setup.py	Sun Apr 10 13:59:30 2011 +0200
@@ -98,7 +98,8 @@
                 ],
             },
             'py2app': {
-                'argv_emulation': 1,
+                'app': ['run_game.py'],
+                'argv_emulation': True,
                 'iconfile': 'data/icons/program/icon.icns',
 #                 'dist_dir': 'dist/nine-tales-%s' % VERSION_STR,
 #                 'bdist_base': 'build/bdist',