jhbuild r2463 - in trunk: . jhbuild modulesets

From: johncarr svn gnome org
To: svn-commits-list gnome org
Subject: jhbuild r2463 - in trunk: . jhbuild modulesets
Date: Wed, 5 Nov 2008 15:03:20 +0000 (UTC)
Author: johncarr
Date: Wed Nov  5 15:03:19 2008
New Revision: 2463
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2463&view=rev

Log:
* jhbuild/moduleset.py:
Allow modulesets to specify a <mirror> node, so jhbuild is
aware of $dvcs-mirror.gnome.org.

* modulesets/moduleset.rnc:
* modulesets/moduleset.dtd:
Update DTD's for new data.

* modulesets/gtk.modules:
* modulesets/gnome-2.16.modules:
* modulesets/gnome-2.18.modules:
* modulesets/online-desktop.modules:
* modulesets/gnome-suites-2.20.modules:
* modulesets/gnome-suites-2.22.modules:
* modulesets/gnome-suites-2.24.modules:
* modulesets/gnome-suites-2.26.modules:
* modulesets/gnome-2.20.modules:
* modulesets/gnome-2.22.modules:
* modulesets/gnome-2.24.modules:
* modulesets/gnome-2.26.modules:
Update modulesets so they know about the dvcs mirrors.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/moduleset.py
   trunk/modulesets/gnome-2.16.modules
   trunk/modulesets/gnome-2.18.modules
   trunk/modulesets/gnome-2.20.modules
   trunk/modulesets/gnome-2.22.modules
   trunk/modulesets/gnome-2.24.modules
   trunk/modulesets/gnome-2.26.modules
   trunk/modulesets/gnome-suites-2.20.modules
   trunk/modulesets/gnome-suites-2.22.modules
   trunk/modulesets/gnome-suites-2.24.modules
   trunk/modulesets/gnome-suites-2.26.modules
   trunk/modulesets/gtk.modules
   trunk/modulesets/moduleset.dtd
   trunk/modulesets/moduleset.rnc
   trunk/modulesets/online-desktop.modules

Modified: trunk/jhbuild/moduleset.py
==============================================================================
--- trunk/jhbuild/moduleset.py	(original)
+++ trunk/jhbuild/moduleset.py	Wed Nov  5 15:03:19 2008
@@ -322,6 +322,17 @@
                     kws[attr.replace('-', '_')] = node.getAttribute(attr)
             repositories[name] = repo_class(config, name, **kws)
             repositories[name].moduleset_uri = uri
+            mirrors = {}
+            for mirror in _child_elements_matching(node, ['mirror']):
+                mirror_type = mirror.getAttribute('type')
+                mirror_class = get_repo_type(mirror_type)
+                kws = {}
+                for attr in mirror_class.init_xml_attrs:
+                    if mirror.hasAttribute(attr):
+                        kws[attr.replace('-','_')] = mirror.getAttribute(attr)
+                mirrors[mirror_type] = mirror_class(config, name, **kws)
+                #mirrors[mirror_type].moduleset_uri = uri
+            setattr(repositories[name], "mirrors", mirrors)
         if node.nodeName == 'cvsroot':
             cvsroot = node.getAttribute('root')
             if node.hasAttribute('password'):

Modified: trunk/modulesets/gnome-2.16.modules
==============================================================================
--- trunk/modulesets/gnome-2.16.modules	(original)
+++ trunk/modulesets/gnome-2.16.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="cvs" name="cairo.freedesktop.org"
       cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/cairo"
       password=""/>

Modified: trunk/modulesets/gnome-2.18.modules
==============================================================================
--- trunk/modulesets/gnome-2.18.modules	(original)
+++ trunk/modulesets/gnome-2.18.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="cairo.freedesktop.org"

Modified: trunk/modulesets/gnome-2.20.modules
==============================================================================
--- trunk/modulesets/gnome-2.20.modules	(original)
+++ trunk/modulesets/gnome-2.20.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="cairo.freedesktop.org"

Modified: trunk/modulesets/gnome-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-2.22.modules	(original)
+++ trunk/modulesets/gnome-2.22.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="cairo.freedesktop.org"

Modified: trunk/modulesets/gnome-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-2.24.modules	(original)
+++ trunk/modulesets/gnome-2.24.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="cvs.cairographics.org"

Modified: trunk/modulesets/gnome-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-2.26.modules	(original)
+++ trunk/modulesets/gnome-2.26.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="cvs.cairographics.org"

Modified: trunk/modulesets/gnome-suites-2.20.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.20.modules	(original)
+++ trunk/modulesets/gnome-suites-2.20.modules	Wed Nov  5 15:03:19 2008
@@ -3,9 +3,11 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
-
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="gstreamer.freedesktop.org"

Modified: trunk/modulesets/gnome-suites-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.22.modules	(original)
+++ trunk/modulesets/gnome-suites-2.22.modules	Wed Nov  5 15:03:19 2008
@@ -3,9 +3,11 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
-
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="gstreamer.freedesktop.org"

Modified: trunk/modulesets/gnome-suites-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.24.modules	(original)
+++ trunk/modulesets/gnome-suites-2.24.modules	Wed Nov  5 15:03:19 2008
@@ -3,9 +3,11 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
-
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="gstreamer.freedesktop.org"

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Wed Nov  5 15:03:19 2008
@@ -3,9 +3,11 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
-
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.gnomemm"
       href="http://svn.gnome.org/svn/gnomemm/"/>
   <repository type="cvs" name="gstreamer.freedesktop.org"

Modified: trunk/modulesets/gtk.modules
==============================================================================
--- trunk/modulesets/gtk.modules	(original)
+++ trunk/modulesets/gtk.modules	Wed Nov  5 15:03:19 2008
@@ -6,8 +6,10 @@
       password=""/>
   <repository type="svn" name="svn.gnome.org" default="yes"
       developer-href-example="svn+ssh://USER svn gnome org/svn/"
-      href="http://svn.gnome.org/svn/";
-  />
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="cvs" name="mime.freedesktop.org"
       cvsroot=":pserver:anoncvs cvs freedesktop org:/cvs/mime"
       password=""/>

Modified: trunk/modulesets/moduleset.dtd
==============================================================================
--- trunk/modulesets/moduleset.dtd	(original)
+++ trunk/modulesets/moduleset.dtd	Wed Nov  5 15:03:19 2008
@@ -2,7 +2,7 @@
 <!ATTLIST moduleset
 	name     CDATA  #IMPLIED>
 
-<!ELEMENT repository EMPTY>
+<!ELEMENT repository (mirror?)>
 <!ATTLIST repository
 	name	 CDATA  #REQUIRED
 	type	 (bzr|cvs|darcs|git|hg|svn|tarball|arch|mtn)  #REQUIRED
@@ -20,6 +20,11 @@
       - Arch: archive & href
       - Monotone: server, database, defbranch -->
 
+<!ELEMENT mirror EMPTY>
+<!ATTLIST mirror
+	type	(bzr|cvs|darcs|git|hg|svn|tarball|arch|mtn)  #REQUIRED
+	href	CDATA  #IMPLIED>
+
 <!ELEMENT include EMPTY>
 <!ATTLIST include href CDATA #REQUIRED>
 

Modified: trunk/modulesets/moduleset.rnc
==============================================================================
--- trunk/modulesets/moduleset.rnc	(original)
+++ trunk/modulesets/moduleset.rnc	Wed Nov  5 15:03:19 2008
@@ -22,11 +22,17 @@
 repository_tarball = attribute type { "tarball" },
                      attribute href { xsd:anyURI }
 
+mirror = element mirror {
+   (repository_cvs|repository_svn|repository_arch|
+   repository_darcs|repository_git|repository_tarball)
+}
+
 repository = element repository {
   attribute name { text },
   attribute default { boolean }?,
   (repository_cvs|repository_svn|repository_arch|
-   repository_darcs|repository_git|repository_tarball)
+   repository_darcs|repository_git|repository_tarball),
+  mirror*
 }
 
 \include = element include {

Modified: trunk/modulesets/online-desktop.modules
==============================================================================
--- trunk/modulesets/online-desktop.modules	(original)
+++ trunk/modulesets/online-desktop.modules	Wed Nov  5 15:03:19 2008
@@ -4,7 +4,10 @@
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
   <repository type="svn" name="svn.gnome.org" default="yes"
-      href="http://svn.gnome.org/svn/"/>
+      href="http://svn.gnome.org/svn/";>
+      <mirror type="bzr" href="http://bzr-mirror.gnome.org/bzr/"; trunk-path="trunk" />
+      <mirror type="git" href="git://git-mirror.gnome.org/git/" />
+  </repository>
   <repository type="svn" name="svn.mugshot.org"
       href="http://svn.mugshot.org/"/>
   <repository type="git" name="git.freedesktop.org"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]