# HG changeset patch
# User Chris Cannam
# Date 1300891804 0
# Node ID 820512d49fcac53b902a053cede055b903400006
# Parent  ce4d06d87a391b5c1382b82eb1e66848d0583438# Parent  1482f5b9f9dc53af49d9cfd82531775e6d2ecb3a
Merge from branch "feature_101"

diff -r 1482f5b9f9dc -r 820512d49fca deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Fri Mar 18 13:14:14 2011 +0000
+++ b/deploy/osx/deploy.sh	Wed Mar 23 14:50:04 2011 +0000
@@ -1,8 +1,16 @@
 #!/bin/bash
 
 # Execute this from the top-level directory of the project (the one
-# that contains the .app bundle).
+# that contains the .app bundle).  Supply the name of the .app bundle
+# as argument (the target will use $app.app regardless, but we need
+# to know the source)
 
+source="$1"
+dmg="$2"
+if [ -z "$source" ] || [ ! -d "$source" ] || [ -z "$dmg" ]; then
+	echo "Usage: $0 <source.app> <target-dmg-basename>"
+	exit 2
+fi
 app=EasyMercurial
 
 version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' version.h`
@@ -13,23 +21,31 @@
 esac
 
 echo
+echo "Making target tree."
+
+volume="$app"-"$version"
+target="$volume"/"$app".app
+dmg="$dmg"-"$version".dmg
+
+mkdir "$volume" || exit 1
+
+ln -s /Applications "$volume"/Applications
+cp -rp "$source" "$target"
+
+echo "Done"
+
 echo "Writing version $bundleVersion in to bundle."
 echo "(This should be a three-part number: major.minor.point)"
 
 perl -p -e "s/EASYHG_VERSION/$bundleVersion/" deploy/osx/Info.plist \
-    > "$app".app/Contents/Info.plist
+    > "$target"/Contents/Info.plist
 
-echo "Done: check $app.app/Contents/Info.plist for sanity please"
-
-bash deploy/osx/paths.sh "$app"
+echo "Done: check $target/Contents/Info.plist for sanity please"
 
 echo
 echo "Making dmg..."
 
-mkdir "$app"-"$version" &&
-	ln -s /Applications "$app"-"$version"/Applications &&
-	cp -rp "$app".app "$app"-"$version"/ &&
-	hdiutil create -srcfolder "$app"-"$version" "$app"-"$version".dmg -volname "$app"-"$version" && 
-	rm -r "$app"-"$version"
+hdiutil create -srcfolder "$volume" "$dmg" -volname "$volume" && 
+	rm -r "$volume"
 
 echo "Done"
diff -r 1482f5b9f9dc -r 820512d49fca version.h
--- a/version.h	Fri Mar 18 13:14:14 2011 +0000
+++ b/version.h	Wed Mar 23 14:50:04 2011 +0000
@@ -1,1 +1,1 @@
-#define EASYHG_VERSION "0.9"
+#define EASYHG_VERSION "0.9.5"