[Jahshaka-cvs] jah/installer/osx create_app, 1.4, 1.5 create_dmg, 1.3, 1.4

[John B. <ok_...@us...>]

Update of /cvsroot/jahshaka/jah/installer/osx
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9697/installer/osx

Modified Files:
	create_app create_dmg 
Log Message:
Mac package script improvements

Index: create_app
===================================================================
RCS file: /cvsroot/jahshaka/jah/installer/osx/create_app,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- create_app	16 Jan 2007 12:03:57 -0000	1.4
+++ create_app	5 Feb 2007 09:51:56 -0000	1.5
@@ -8,8 +8,8 @@
 #   - jahwidgets build
 
 if [ $# -lt 7 ] ; then
-   echo "Usage: create_app --universal <script> <python_ver> <jahwidgets> <olib_prefix> <olib_ver> <lib_prefix> <qt_prefix>"
-   echo "e.g. create_app jahplayer.py 2.4 ~/jah/jahwidgets /usr/olibs 0.4.0 /opt/local /usr/local/qt"
+   echo "Usage: create_app --universal <script> <bundle_ver> <python_ver> <jahwidgets> <olib_prefix> <olib_ver> <lib_prefix> <qt_prefix>"
+   echo "e.g. create_app jahplayer.py 0.2.1 2.4 ~/jah/jahwidgets /usr/olibs 0.4.0 /opt/local /usr/local/qt"
    exit
 fi
 
@@ -23,12 +23,13 @@
 
 # Strip any trailing '/'
 py_script=$1
-py_ver=$2
-jahwidgets=${3%/}
-olib_prefix=${4%/}
-olib_ver=$5
-lib_prefix=${6%/}
-qt_prefix=${7%/}
+bundle_version=$2
+py_ver=$3
+jahwidgets=${4%/}
+olib_prefix=${5%/}
+olib_ver=$6
+lib_prefix=${7%/}
+qt_prefix=${8%/}
 
 app_name=${py_script%.py}
 
@@ -195,6 +196,8 @@
 # Info.plist
 python "$script_root/set_plist_value.py" "$bundle/Contents/Info.plist" "CFBundleIdentifier" "org.jahshaka.$app_name"
 python "$script_root/set_plist_value.py" "$bundle/Contents/Info.plist" "CFBundleIconFile" "$app_name.icns"
+python "$script_root/set_plist_value.py" "$bundle/Contents/Info.plist" "CFBundleVersion" "$bundle_version"
+python "$script_root/set_plist_value.py" "$bundle/Contents/Info.plist" "CFBundleShortVersionString" "$bundle_version"
 
 if [ "$prefer_ppc" != "" ] ; then
     python "$script_root/set_plist_value.py" "$bundle/Contents/Info.plist" "LSPrefersPPC" "true"

Index: create_dmg
===================================================================
RCS file: /cvsroot/jahshaka/jah/installer/osx/create_dmg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- create_dmg	16 Jan 2007 12:03:57 -0000	1.3
+++ create_dmg	5 Feb 2007 09:51:56 -0000	1.4
@@ -14,4 +14,6 @@
 fi
 
 hdiutil create -srcdir "$srcdir" -volname "$vol" -ov "$dmg"
-mv "$dmg" "$srcdir"
+if [ -e "dmgs" ] ; then
+    mv "$dmg" "dmgs"
+fi