Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a gramps33 target to the moduleset; also some whitespace cleanup and spellcheck dependencies to gramps-svn target

Browse Source 
svn: r17345
This commit is contained in:
John Ralls 2011-04-29 21:28:50 +00:00
parent a5949b6ce8
commit 618e5deb5b
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mac/gramps.modules
View File

@ -3,9 +3,9 @@
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
<repository type="tarball" name="sourceforge"
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="pywebkitgtk"
<repository type="tarball" name="pywebkitgtk"
href="http://pywebkitgtk.googlecode.com/files/"/>
<repository type="tarball" name="ftp.gnome.org"
href="http://ftp.gnome.org/pub/GNOME/sources/"/>
@ -27,18 +27,18 @@ Special instructions:
Gramps uses BerkeleyDB (BDB) via Python. BDB is normally included in Linux systems, but Apple prefers other mechanisms for data storage, so it isn't included on Macs.
jhbuild bootstrap && jhbuild &double-hyphen;moduleset=http://github.com/jralls/gtk-osx-build/raw/master/projects/gramps/gramps.modules build meta-gtk-osx-bootstrap gramps
If you're going to bundle GRAMPS, you'll need to add
If you're going to bundle GRAMPS, you'll need to add
_gtk_osx_use_jhbuild_python = True
to your .jhbuildrc-custom and pass the &double-hyphen;ignore-system argument to jhbuild bootstrap. (That &double-hyphen; entity is fake because double-hyphens aren't allowed in xml comments. Just substitute a real double-hyphen when you type it on the command line.)
to your .jhbuildrc-custom and pass the &double-hyphen;ignore-system argument to jhbuild bootstrap. (That &double-hyphen; entity is fake because double-hyphens aren't allowed in xml comments. Just substitute a real double-hyphen when you type it on the command line.)
Open a jhbuild shell.
For reasons known only to themselves, the Python project have set up their makefiles to create libpython without write privs, so you need to
For reasons known only to themselves, the Python project have set up their makefiles to create libpython without write privs, so you need to
chmod +w $PREFIX/lib/libpython2.6.dylib
before running
before running
ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
@ -69,6 +69,19 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
</dependencies>
</autotools>
<autotools id="gramps33" >
<branch module="gramps" revision="maintenance/gramps33" repo="gramps"/>
<dependencies>
<dep package="meta-gtk-osx-python"/>
<dep package="pyWebKitGtk"/>
<dep package="librsvg2"/>
<dep package="pygoocanvas"/>
<dep package="shared-mime-info"/>
<dep package="pyenchant"/>
<dep package="pygtk-extras"/>
</dependencies>
</autotools>
<autotools id="gramps-svn" >
<branch module="gramps" repo="gramps"/>
<dependencies>
@ -77,7 +90,9 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<dep package="librsvg2"/>
<dep package="pygoocanvas"/>
<dep package="shared-mime-info"/>
</dependencies>
<dep package="pyenchant"/>
<dep package="pygtk-extras"/>
</dependencies>
</autotools>
<distutils id="gramps-addons">
@ -151,7 +166,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
</autotools>
<autotools id="berkeleydb" autogen-sh="dist/configure"
autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
makeinstallargs="-C build_unix install">
<branch module="berkeley-db/db-4.7.25.NC.tar.gz" version="4.7.25"

2
src/const.py.in
View File

@ -80,7 +80,7 @@ APP_VCARD = ["text/x-vcard", "text/x-vcalendar"]
# system paths
#
#-------------------------------------------------------------------------
if sys.platform == "win32":
if sys.platform == "win32" or sys.platform == "darwin":
if sys.prefix == os.path.dirname(os.getcwd()):
PREFIXDIR = sys.prefix
SYSCONFDIR = os.path.join(sys.prefix, "etc")