From: jiho-sf <jiho-sf@users.sourceforge.net>
Date: Wed, 13 Feb 2008 22:17:52 +0000 (+0000)
Subject: quick fix to OS X packaging script to allow the incorporation of Python in the bundle... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=23475f4d882bfc027cfbe18260eb5098b59cf82d;p=inkscape.git

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.
---

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"