jhbuild r2618 - in trunk: . doc/C jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Sun Jan  4 13:23:02 2009
New Revision: 2618
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2618&view=rev

Log:
* jhbuild/config.py, jhbuild/defaults.jhbuildrc, jhbuild/moduleset.py,
doc/C/jhbuild.xml: added a new modulesets_dir configuration variable,
so it is possible to define an alternate directory for moduleset files;
added an entry about this configuration variable to the documentation.
(closes: #566456, initial patch by David Farning)



Modified:
   trunk/ChangeLog
   trunk/doc/C/jhbuild.xml
   trunk/jhbuild/config.py
   trunk/jhbuild/defaults.jhbuildrc
   trunk/jhbuild/moduleset.py

Modified: trunk/doc/C/jhbuild.xml
==============================================================================
--- trunk/doc/C/jhbuild.xml	(original)
+++ trunk/doc/C/jhbuild.xml	Sun Jan  4 13:23:02 2009
@@ -1512,6 +1512,15 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
+	  <term id="cfg-modulesets-dir"><varname>modulesets_dir</varname></term>
+	  <listitem>
+	    <simpara>A string giving the directory containing the
+	    modulesets to use.  Defaults to the
+	    <filename>modulesets/</filename> directory in JHBuild sources.
+	    </simpara>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
 	  <term id="cfg-nobuild"><varname>nobuild</varname></term>
 	  <listitem>
 	    <simpara>A boolean value which, if set to

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sun Jan  4 13:23:02 2009
@@ -46,7 +46,7 @@
                 'quiet_mode', 'progress_bar', 'module_extra_env',
                 'jhbuildbot_master', 'jhbuildbot_slavename', 'jhbuildbot_password',
                 'jhbuildbot_svn_commits_box',
-                'use_local_modulesets', 'ignore_suggests',
+                'use_local_modulesets', 'ignore_suggests', 'modulesets_dir',
                 'mirror_policy', 'module_mirror_policy',
                 ]
 

Modified: trunk/jhbuild/defaults.jhbuildrc
==============================================================================
--- trunk/jhbuild/defaults.jhbuildrc	(original)
+++ trunk/jhbuild/defaults.jhbuildrc	Sun Jan  4 13:23:02 2009
@@ -7,6 +7,9 @@
 if 'GTK_PATH' in os.environ.keys():
     del os.environ['GTK_PATH']
 
+# module directory
+modulesets_dir = os.path.join(os.path.dirname(__file__), '../modulesets')
+
 # what modules to build?
 moduleset = 'gnome-2.26'
 modules = [ 'meta-gnome-desktop' ]

Modified: trunk/jhbuild/moduleset.py
==============================================================================
--- trunk/jhbuild/moduleset.py	(original)
+++ trunk/jhbuild/moduleset.py	Sun Jan  4 13:23:02 2009
@@ -284,8 +284,7 @@
     for uri in modulesets:
         if '/' not in uri:
             if config.nonetwork or config.use_local_modulesets:
-                uri = os.path.join(os.path.dirname(__file__), '..', 'modulesets',
-                                   uri + '.modules')
+                uri = os.path.join(config.modulesets_dir, uri + '.modules')
             else:
                 uri = 'http://svn.gnome.org/svn/jhbuild/trunk/modulesets/%s.modules' % uri
         ms.modules.update(_parse_module_set(config, uri).modules)