diff options
| author | JiHO <jiho-sf@users.sourceforge.net> | 2008-02-13 22:17:52 +0000 |
|---|---|---|
| committer | jiho-sf <jiho-sf@users.sourceforge.net> | 2008-02-13 22:17:52 +0000 |
| commit | 3241ab2e76a76f4e6bf6c84a48c24fa0be02e632 (patch) | |
| tree | 72b448c8029d78e91cb43caeacec2385d51c71a9 /packaging | |
| parent | comment fix (diff) | |
| download | inkscape-3241ab2e76a76f4e6bf6c84a48c24fa0be02e632.tar.gz inkscape-3241ab2e76a76f4e6bf6c84a48c24fa0be02e632.zip | |
quick fix to OS X packaging script to allow the incorporation of Python in the bundle. Not perfect yet but a TODO is added in the file and gives informations on what to improve.
(bzr r4727)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 2 | ||||
| -rwxr-xr-x | packaging/macosx/osx-build.sh | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 8e0970b39..ba6b7570d 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -100,7 +100,7 @@ do help exit 0 ;; *) - echo "Invalid command line option" + echo "Invalid command line option: $1" exit 2 ;; esac shift 1 diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 487ed2bed..0356d413f 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -137,13 +137,13 @@ do -p|--prefix) INSTALLPREFIX=$2 shift 1 ;; - -s|-strip) + -s|--strip) STRIP="-s" ;; -py|--with-python) PYTHON_MODULES="$2" shift 1 ;; *) - echo "Invalid command line option" + echo "Invalid command line option: $1" exit 2 ;; esac shift 1 @@ -251,11 +251,12 @@ then # Set python command line option (if PYTHON_MODULES location is not empty, then add the python call to the command line, otherwise, stay empty) if [[ "$PYTHON_MODULES" != "" ]]; then - PYTHON_MODULES="-py '$PYTHON_MODULES'" + PYTHON_MODULES="-py $PYTHON_MODULES" + # TODO: fix this: it does not allow for spaces in the PATH under this form and cannot be quoted fi # Create app bundle - ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/Info.plist "$PYTHON_MODULES" + ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/Info.plist $PYTHON_MODULES status=$? if [[ $status -ne 0 ]]; then echo -e "\nApplication bundle creation failed" |