X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=packaging%2Fmacosx%2Fosx-build.sh;h=15af2589ff791d4cfba9438117d5e867ced23f56;hb=a4d12a5147f3d1d6b568a326e39ef5dca384248d;hp=f1fbb93dde071f985bb0e5b6a8c633112b522c5e;hpb=3f95370f780ab3a88cf5917e98a81b1a52165e74;p=inkscape.git

diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index f1fbb93dd..15af2589f 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -61,16 +61,18 @@ Compilation script for Inkscape on Mac OS X.
   \033[1md,dist,distrib\033[0m
     store Inkscape.app in a disk image (dmg) for distribution
     \033[1m-py,--with-python\033[0m	specify python packages path for inclusion into the dmg image
-	
+  \033[1mall\033[0m
+    do everything (update, configure, build, install, package, distribute)
+
 \033[1mEXAMPLES\033[0m
   \033[1m$0 conf build install\033[0m
     configure, build and install a dowloaded version of Inkscape in the default
     directory, keeping debugging information.	
-  \033[1m$0 -p ~ -s -py ~/pyxml/ u a c b i p d\033[0m
+  \033[1m$0 u a c b -p ~ i -s p -py ~/pyxml/ d\033[0m
     update an svn checkout, prepare configure script, configure,
-    build and install Inkscape in the user home directory. 	
+    build and install Inkscape in the user home directory (~). 	
     Then package Inkscape withouth debugging information,
-    with python packages from ~/pyxml/ and prepare it for   
+    with python packages from ~/pyxml/ and prepare a dmg for   
     distribution."
 }
 
@@ -104,6 +106,14 @@ do
 	h|help)
 		help 
 		exit 1 ;;
+	all)            
+		SVNUPDATE="t"
+		AUTOGEN="t"
+		CONFIGURE="t"
+		BUILD="t" 
+		INSTALL="t"
+		PACKAGE="t"
+		DISTRIB="t" ;;
    u|up|update)
 		SVNUPDATE="t" ;;
    a|auto|autogen)
@@ -118,9 +128,9 @@ do
 		PACKAGE="t" ;;
 	d|dist|distrib)
 		DISTRIB="t" ;;
-	# -p|--prefix)
-	#   	INSTALLPREFIX=$2
-	#   	shift 1 ;;
+	-p|--prefix)
+	  	INSTALLPREFIX=$2
+	  	shift 1 ;;
 	-s|-strip)
 	     	STRIP="t" ;;
 	-py|--with-python)
@@ -253,6 +263,12 @@ fi
 
 if [[ "$DISTRIB" == "t" ]]
 then	
+	REVISION=`head -n 4 ../../.svn/entries | tail -n 1`
+	ARCH=`arch | tr [p,c] [P,C]`
+	NEWNAME="Inkscape-$REVISION-$ARCH"
+	DMGFILE="$NEWNAME.dmg"
+	INFOFILE="$NEWNAME-info.txt"
+
 	# Create dmg bundle
 	if [[ "$PYTHON" == "t" ]]; then
 		./osx-dmg.sh -py "$PYTHONDIR"
@@ -265,30 +281,29 @@ then
 		exit $status
 	fi
 
-	DATE=`date "+%Y%m%d"`
-	mv Inkscape.dmg Inkscape_$DATE.dmg
+	mv Inkscape.dmg $DMGFILE
 	
 	# Prepare information file
-# 	INFOFILE=Inkscape_$DATE-info.txt
-# 	echo "Version information on $DATE for `whoami`:
-# 	OS X      `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
-# 	DarwinPorts  `port version | cut -f2 -d \ `
-# 	GCC          `gcc --version | grep GCC`
-# 	GTK          `pkg-config --modversion gtk+-2.0`
-# 	GTKmm        `pkg-config --modversion gtkmm-2.4`
-# 	Cairo        `pkg-config --modversion cairo`
-# 	Cairomm      `pkg-config --modversion cairomm-1.0`
-# 	CairoPDF     `pkg-config --modversion cairo-pdf`
-# 	Pango        `pkg-config --modversion pango`
-# Configure options:
-# 	$CONFFLAGS" > $INFOFILE
-# 	if [[ "$STRIP" == "t" ]]; then
-# 		echo "Debug info
-# 	no" >> $INFOFILE
-# 	else
-# 		echo "Debug info
-# 	yes" >> $INFOFILE
-# 	fi
+	echo "Version information on $DATE for `whoami`:
+	OS X      `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
+	Architecture $ARCH
+	DarwinPorts  `port version | cut -f2 -d \ `
+	GCC          `gcc --version | grep GCC`
+	GTK          `pkg-config --modversion gtk+-2.0`
+	GTKmm        `pkg-config --modversion gtkmm-2.4`
+	Cairo        `pkg-config --modversion cairo`
+	Cairomm      `pkg-config --modversion cairomm-1.0`
+	CairoPDF     `pkg-config --modversion cairo-pdf`
+	Pango        `pkg-config --modversion pango`
+Configure options:
+	$CONFFLAGS" > $INFOFILE
+	if [[ "$STRIP" == "t" ]]; then
+		echo "Debug info
+	no" >> $INFOFILE
+	else
+		echo "Debug info
+	yes" >> $INFOFILE
+	fi
 	
 	# open a Finder window here
 	open .