Update mac build files

svn: r18792

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>

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" "$@"