Remove unused configure flags

[inkscape.git] / packaging / macosx / osx-build.sh

diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index 487ed2bedb9c72feac3fca3c4e13bcf8bc5a3088..af75112a8a963ae494ea9fcca136e63e42fe9829 100755 (executable)
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -21,7 +21,7 @@
 # User modifiable parameters
 #----------------------------------------------------------
 # Configure flags
-CONFFLAGS="--disable-static --enable-shared --enable-osxapp"
+CONFFLAGS="--enable-osxapp"
 # Libraries prefix (Warning: NO trailing slash)
 LIBPREFIX="/opt/local"
 # User name on Modevia
@@ -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"
@@ -266,7 +267,8 @@ fi
 # Fetch some information
 REVISION=`head -n 4 ../../.svn/entries | tail -n 1`
 ARCH=`arch | tr [p,c] [P,C]`
-NEWNAME="Inkscape-$REVISION-$ARCH"
+MINORVERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \.`
+NEWNAME="Inkscape-$REVISION-10.$MINORVERSION-$ARCH"
 DMGFILE="$NEWNAME.dmg"
 INFOFILE="$NEWNAME-info.txt"
 
@@ -284,7 +286,7 @@ then
        
        # Prepare information file
        echo "Version information on $DATE for `whoami`:
-       OS X      `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
+       OS X       `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
        Architecture $ARCH
        DarwinPorts  `port version | cut -f2 -d \ `
        GCC          `gcc --version | grep GCC`
@@ -320,7 +322,7 @@ then
        fi
 fi
 
-if [[ "$PACKAGE" == "t" ]] | [[ "$DISTRIB" == "t" ]]; then
+if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then
        # open a Finder window here to admire what we just produced
        open .
 fi