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

svn: r17350
This commit is contained in:
John Ralls 2011-04-29 22:04:17 +00:00
parent d39537086e
commit 85cd1b50c6

View File

@ -3,9 +3,9 @@
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset> <moduleset>
<repository type="tarball" name="sourceforge" <repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/> href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="pywebkitgtk" <repository type="tarball" name="pywebkitgtk"
href="http://pywebkitgtk.googlecode.com/files/"/> href="http://pywebkitgtk.googlecode.com/files/"/>
<repository type="tarball" name="ftp.gnome.org" <repository type="tarball" name="ftp.gnome.org"
href="http://ftp.gnome.org/pub/GNOME/sources/"/> 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. 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 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 _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. 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 chmod +w $PREFIX/lib/libpython2.6.dylib
before running before running
ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle 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> </dependencies>
</autotools> </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" > <autotools id="gramps-svn" >
<branch module="gramps" repo="gramps"/> <branch module="gramps" repo="gramps"/>
<dependencies> <dependencies>
@ -77,7 +90,9 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<dep package="librsvg2"/> <dep package="librsvg2"/>
<dep package="pygoocanvas"/> <dep package="pygoocanvas"/>
<dep package="shared-mime-info"/> <dep package="shared-mime-info"/>
</dependencies> <dep package="pyenchant"/>
<dep package="pygtk-extras"/>
</dependencies>
</autotools> </autotools>
<distutils id="gramps-addons"> <distutils id="gramps-addons">
@ -151,7 +166,7 @@ ige-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
</autotools> </autotools>
<autotools id="berkeleydb" autogen-sh="dist/configure" <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"> makeinstallargs="-C build_unix install">
<branch module="berkeley-db/db-4.7.25.NC.tar.gz" version="4.7.25" <branch module="berkeley-db/db-4.7.25.NC.tar.gz" version="4.7.25"