Update mac build files

svn: r18791
This commit is contained in:
John Ralls 2012-01-29 01:45:16 +00:00
parent 8535db8d93
commit 3842c5a6a7
3 changed files with 28 additions and 11 deletions

View File

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Gramps</string> <string>Gramps</string>
<key>CFBundleGetInfoString</key> <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> <key>CFBundleIconFile</key>
<string>gramps.icns</string> <string>gramps.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@ -23,7 +23,7 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>Trunk</string> <string>Trunk</string>
<key>NSHumanReadableCopyright</key> <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> <key>LSMinimumSystemVersion</key>
<string>10.5</string> <string>10.5</string>
</dict> </dict>

View File

@ -5,7 +5,7 @@
<prefix name="default">${env:JHBUILD_PREFIX}</prefix> <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
<destination overwrite="yes">${env:HOME}/Desktop</destination> <destination overwrite="yes">${env:HOME}/Desktop</destination>
<run-install-name-tool/> <run-install-name-tool/>
<launcher-script>${project}/launcher.sh</launcher-script > <launcher-script>${project}/gramps.launcher</launcher-script >
</meta> </meta>
<plist>${project}/Info.plist</plist> <plist>${project}/Info.plist</plist>
@ -47,19 +47,23 @@
</binary> </binary>
<binary recurse="True"> <binary recurse="True">
${prefix}/lib/python2.6/*.so ${prefix}/lib/python2.7/*.so
</binary> </binary>
<binary> <binary>
${prefix}/lib/librsvg-2.2.dylib ${prefix}/lib/librsvg-2.2.dylib
</binary> </binary>
<!--binary>
${prefix}/lib/libwebkit-1.0.2.dylib
</binary-->
<binary> <binary>
${prefix}/lib/libgoocanvas.3.dylib ${prefix}/lib/libgoocanvas.3.dylib
</binary> </binary>
<binary> <binary>
${prefix}/lib/libigemacintegration.0.dylib ${prefix}/lib/libgtkmacintegration.0.dylib
</binary> </binary>
<binary> <binary>
@ -83,11 +87,11 @@
</binary> </binary>
<binary> <binary>
${prefix}/lib/libproxy.0.dylib ${prefix}/lib/libosmgpsmap.2.dylib
</binary> </binary>
<binary> <binary>
${prefix}/lib/libhunspell-1.2.0.dylib ${prefix}/lib/libhunspell-1.3.0.dylib
</binary> </binary>
<binary> <binary>
@ -118,13 +122,25 @@
<!-- We have to pull in the python modules, which are mixed python <!-- We have to pull in the python modules, which are mixed python
and loadable modules. --> and loadable modules. -->
<data recurse="True"> <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>
<data> <data>
${prefix}/share/gramps/ ${prefix}/share/gramps/
</data> </data>
<!--data>
${prefix}/share/webkit-1.0/
</data-->
<data> <data>
${prefix}/share/enchant/ ${prefix}/share/enchant/
</data> </data>

View File

@ -28,9 +28,10 @@ export GVBINDIR="$bundle_lib/graphviz"
#Set $PYTHON to point inside the bundle #Set $PYTHON to point inside the bundle
PYVER=2.6 PYVER=2.7
export PYTHON="$bundle_contents/MacOS/python" export PYTHON="$bundle_contents/MacOS/python"
export PYTHONHOME="$bundle_res" 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 PYTHONPATH="$bundle_lib/python$PYVER/site-packages/gtk-2.0:$PYTHONPATH"
export GRAMPSDIR="$bundle_data"/gramps export GRAMPSDIR="$bundle_data"/gramps
@ -38,8 +39,8 @@ export GRAMPSI18N="$bundle_data"/locale
export GRAMPSHOME="$HOME/Library/Application Support" export GRAMPSHOME="$HOME/Library/Application Support"
# Strip out the argument added by the OS. # 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 shift 1
fi fi
exec $PYTHON -O "$GRAMPSDIR/gramps.py" "$@" exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@"