From 3842c5a6a74c448de9f4d6cbdf2bc596e52a2ba9 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 29 Jan 2012 01:45:16 +0000
Subject: [PATCH] Update mac build files

svn: r18791
---
 mac/Info.plist                       |  4 ++--
 mac/gramps.bundle                    | 28 ++++++++++++++++++++++------
 mac/{launcher.sh => gramps.launcher} |  7 ++++---
 3 files changed, 28 insertions(+), 11 deletions(-)
 rename mac/{launcher.sh => gramps.launcher} (86%)

diff --git a/mac/Info.plist b/mac/Info.plist
index 8c4a06347..ef1f353b4 100755
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Trunk, (C) 1997-2011 The Gramps Team http://www.gramps-project.org</string>
+    <string>Trunk, (C) 1997-2012 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -23,7 +23,7 @@
     <key>CFBundleVersion</key>
     <string>Trunk</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2011 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2012 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.5</string>
 </dict>
diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index 08cb3fb49..9db6ab404 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -5,7 +5,7 @@
     <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
     <destination overwrite="yes">${env:HOME}/Desktop</destination>
     <run-install-name-tool/>
-    <launcher-script>${project}/launcher.sh</launcher-script >
+    <launcher-script>${project}/gramps.launcher</launcher-script >
   </meta>
 
   <plist>${project}/Info.plist</plist>
@@ -47,19 +47,23 @@
   </binary>
 
   <binary recurse="True">
-    ${prefix}/lib/python2.6/*.so
+    ${prefix}/lib/python2.7/*.so
   </binary>
 
   <binary>
     ${prefix}/lib/librsvg-2.2.dylib
   </binary>
 
+  <!--binary>
+    ${prefix}/lib/libwebkit-1.0.2.dylib
+  </binary-->
+
   <binary>
     ${prefix}/lib/libgoocanvas.3.dylib
   </binary>
 
   <binary>
-    ${prefix}/lib/libigemacintegration.0.dylib
+    ${prefix}/lib/libgtkmacintegration.0.dylib
   </binary>
 
   <binary>
@@ -83,11 +87,11 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libproxy.0.dylib
+     ${prefix}/lib/libosmgpsmap.2.dylib
   </binary>
 
   <binary>
-    ${prefix}/lib/libhunspell-1.2.0.dylib
+    ${prefix}/lib/libhunspell-1.3.0.dylib
   </binary>
 
   <binary>
@@ -118,13 +122,25 @@
   <!-- We have to pull in the python modules, which are mixed python
        and loadable modules.  -->
   <data recurse="True">
-    ${prefix}/lib/python2.6/*.py
+    ${prefix}/lib/python2.7/*.py
+  </data>
+
+  <data>
+    ${prefix}/lib/python2.7/config/
+  </data>
+
+  <data>
+    ${prefix}/include/python2.7/pyconfig.h
   </data>
 
   <data>
     ${prefix}/share/gramps/
   </data>
 
+  <!--data>
+    ${prefix}/share/webkit-1.0/
+  </data-->
+
   <data>
     ${prefix}/share/enchant/
   </data>
diff --git a/mac/launcher.sh b/mac/gramps.launcher
similarity index 86%
rename from mac/launcher.sh
rename to mac/gramps.launcher
index 83f2b406b..f183725d6 100755
--- a/mac/launcher.sh
+++ b/mac/gramps.launcher
@@ -28,9 +28,10 @@ export GVBINDIR="$bundle_lib/graphviz"
 
 
 #Set $PYTHON to point inside the bundle
-PYVER=2.6
+PYVER=2.7
 export PYTHON="$bundle_contents/MacOS/python"
 export PYTHONHOME="$bundle_res"
+PYTHONPATH="$bundle_lib/python$PYVER/site-packages/pyenchant-1.6.1-py$PYVER.egg:$PYTHONPATH"
 export PYTHONPATH="$bundle_lib/python$PYVER/site-packages/gtk-2.0:$PYTHONPATH"
 
 export GRAMPSDIR="$bundle_data"/gramps
@@ -38,8 +39,8 @@ export GRAMPSI18N="$bundle_data"/locale
 export GRAMPSHOME="$HOME/Library/Application Support"
 
 # Strip out the argument added by the OS.
-if [ x`echo "x$1" | /usr/bin/sed -e "s/^x-psn_.*//"` == x ]; then
+if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
     shift 1
 fi
-exec $PYTHON -O "$GRAMPSDIR/gramps.py" "$@"
+exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@"