From: jiho-sf <jiho-sf@users.sourceforge.net>
Date: Sat, 12 May 2007 22:13:22 +0000 (+0000)
Subject: - new parameters in the info file accompanying the dmg
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5600220687f4e486c570cf111745b2f1e4a143c1;p=inkscape.git

- new parameters in the info file accompanying the dmg
- the dmg bundle is named with the latest revision and the architecture. The svn revision number is taken from the entries file at the base of Inkscape's source code tree rather than through svn info to allow people without svn to use osx-build.sh (on a prepackaged svn snapshot for example)
---

diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index f1fbb93dd..92a43d99b 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -253,6 +253,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 +271,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 .