jhbuild r2303 - in trunk: . doc doc/C jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Sun Aug 24 10:42:18 2008
New Revision: 2303
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2303&view=rev

Log:
* jhbuild/config.py, jhbuild/defaults.jhbuildrc, jhbuild/moduleset.py:
download modulesets from svn.gnome.org by default, new option
(use_local_modulesets) to use the local copy.



Modified:
   trunk/ChangeLog
   trunk/doc/C/jhbuild.xml
   trunk/doc/ChangeLog
   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 Aug 24 10:42:18 2008
@@ -1563,6 +1563,16 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
+	  <term><varname>use_local_modulesets</varname></term>
+	  <listitem>
+	    <simpara>A boolean value that specifies to use modulesets
+	    that were checked out along the JHBuild source code; instead
+	    of downloading them on-the-fly from GNOME Subversion repository.
+	    Defaults to <constant>False</constant>.
+	    </simpara>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
 	  <term><varname>xvfbargs</varname></term>
 	  <listitem>
 	    <simpara>A string listing arguments to pass to

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sun Aug 24 10:42:18 2008
@@ -45,6 +45,7 @@
                 'quiet_mode', 'progress_bar', 'module_extra_env',
                 'jhbuildbot_master', 'jhbuildbot_slavename', 'jhbuildbot_password',
                 'jhbuildbot_svn_commits_box',
+                'use_local_modulesets',
                 ]
 
 env_prepends = {}

Modified: trunk/jhbuild/defaults.jhbuildrc
==============================================================================
--- trunk/jhbuild/defaults.jhbuildrc	(original)
+++ trunk/jhbuild/defaults.jhbuildrc	Sun Aug 24 10:42:18 2008
@@ -127,3 +127,6 @@
 
 # options for jhbuildbot master
 jhbuildbot_svn_commits_box = None
+
+# whether to use a local copy of modulesets (instead of fetching them from svn)
+use_local_modulesets = False

Modified: trunk/jhbuild/moduleset.py
==============================================================================
--- trunk/jhbuild/moduleset.py	(original)
+++ trunk/jhbuild/moduleset.py	Sun Aug 24 10:42:18 2008
@@ -241,8 +241,11 @@
     ms = ModuleSet(config = config)
     for uri in modulesets:
         if '/' not in uri:
-            uri = os.path.join(os.path.dirname(__file__), '..', 'modulesets',
-                               uri + '.modules')
+            if config.nonetwork or config.use_local_modulesets:
+                uri = os.path.join(os.path.dirname(__file__), '..', 'modulesets',
+                                   uri + '.modules')
+            else:
+                uri = 'http://svn.gnome.org/svn/jhbuild/trunk/modulesets/%s.modules' % uri
         ms.modules.update(_parse_module_set(config, uri).modules)
     return ms