Update jhbuildrc

1 files changed, 14 insertions, 35 deletions

diff --git a/jhbuildrc b/jhbuildrc
index 8b15ef6..c0a355f 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -1,35 +1,14 @@
-# how to use this file?
-#
-# mkdir -p $HOME/spice
-# git clone git://anongit.freedesktop.org/git/xorg/util/modular/ $HOME/xorg/util/modular
-# git clone git://people.freedesktop.org/~teuf/spice-jhbuild ~/spice/spice-jhbuild
-# jhbuild -f $HOME/spice/spice-jhbuild/jhbuildrc
-#
-# Source tree will be in $HOME/spice/
-# Binaries will be in $HOME/spice-usr
-#
-
-moduleset = os.path.join(os.environ['HOME'], 'spice', 'spice-jhbuild', 'modulesets', 'spice.xml')
-
-modules = [ 'spice-gtk', 'qemu' ]
-
-# All module sources will be in $HOME/spice/ after the checkout
-checkoutroot = os.path.join(os.environ['HOME'], 'spice')
-# All module binaries will be in $HOME/spice-usr/ after the checkout
-prefix = os.path.join(os.environ['HOME'], 'spice-usr')
-
-# Look in /usr/share for icons, D-BUS service files, etc
-addpath('XDG_DATA_DIRS', '/usr/share')
-# Look in /etc/xdg for system-global autostart files
-addpath('XDG_CONFIG_DIRS', '/etc/xdg')
-
-os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
-os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') \
-    + ':' + os.path.join(prefix, 'share', 'pkgconfig')
-
-# custom CFLAGS / environment pieces for the build
-# os.environ['CFLAGS'] = '-Wall -g -O0'
-
-# Additional flags for make can be specified here
-# Set makeargs to 'V=1' for verbose build output.
-# makeargs = '-j8'
+# Copy this file to ~/.jhbuildrc-custom to get gtk-osx to use it
+# You can also copy it to ~/.jhbuildrc-spice and set the JHB environment
+# variable to "spice" to get jhbuild from gtk-osx to use it
+
+# target dirs for source and binaries
+_root = os.path.expanduser("~/spice-jhbuild")
+checkoutroot = os.path.join(_root, "source")
+prefix = os.path.join(_root, "inst")
+
+# spice gtk-osx moduleset
+moduleset = 'http://cgit.freedesktop.org/~teuf/spice-jhbuild/plain/modulesets/spice.xml?h=osx'
+modules = [ "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "virt-viewer" ]
+#for a gtk3 build use these modules
+#modules = [ "meta-gtk-osx-bootstrap", "meta-gtk-osx-gtk3", "virt-viewer-3.0" ]