jhbuild r2507 - in trunk: . jhbuild/versioncontrol modulesets

[johncarr svn gnome org]

Author: johncarr
Date: Thu Nov 13 13:12:09 2008
New Revision: 2507
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2507&view=rev

Log:
Implement support for tags in svn repositories

Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/svn.py
   trunk/modulesets/gnome-2.16.modules
   trunk/modulesets/gnome-2.18.modules
   trunk/modulesets/hildon.modules

Modified: trunk/jhbuild/versioncontrol/svn.py
==============================================================================
--- trunk/jhbuild/versioncontrol/svn.py	(original)
+++ trunk/jhbuild/versioncontrol/svn.py	Thu Nov 13 13:12:09 2008
@@ -119,9 +119,9 @@
         self.tags_template = tags_template or "%(module)s/tags/%(tag)s"
         self.svn_program = config.svn_program
 
-    branch_xml_attrs = ['module', 'checkoutdir', 'revision']
+    branch_xml_attrs = ['module', 'checkoutdir', 'revision', 'tag']
 
-    def branch(self, name, module=None, checkoutdir=None, revision=None):
+    def branch(self, name, module=None, checkoutdir=None, revision=None, tag=None):
         module_href = None
         if name in self.config.branches:
             if self.config.branches[name]:
@@ -136,6 +136,8 @@
             if revision:
                 if not revision.isdigit():
                     template = self.branches_template
+            elif tag:
+                template = self.tags_template
         else:
             module = name
             if revision:
@@ -143,6 +145,8 @@
                     template = self.trunk_template
                 else:
                     template = self.branches_template
+            elif tag:
+                template = self.tags_template
             else:
                 template = self.trunk_template
 
@@ -152,7 +156,7 @@
                 module_href = template % {
                     'module': module,
                     'branch': revision,
-                    'tag': revision,
+                    'tag': tag,
                 }
             else:
                 module_href = urlparse.urljoin(self.href, module)

Modified: trunk/modulesets/gnome-2.16.modules
==============================================================================
--- trunk/modulesets/gnome-2.16.modules	(original)
+++ trunk/modulesets/gnome-2.16.modules	Thu Nov 13 13:12:09 2008
@@ -189,7 +189,7 @@
     </dependencies>
   </autotools>
   <autotools id="atk">
-    <branch module="atk/tags/gnome-2-16"/>
+    <branch tag="gnome-2-16" />
     <dependencies>
       <dep package="glib"/>
     </dependencies>
@@ -204,7 +204,7 @@
     </dependencies>
   </autotools>
   <autotools id="gail">
-    <branch module="gail/tags/gnome-2-16"/>
+    <branch tag="gnome-2-16"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="atk"/>

Modified: trunk/modulesets/gnome-2.18.modules
==============================================================================
--- trunk/modulesets/gnome-2.18.modules	(original)
+++ trunk/modulesets/gnome-2.18.modules	Thu Nov 13 13:12:09 2008
@@ -378,7 +378,7 @@
     </dependencies>
   </autotools>
   <autotools id="libgnomecanvas">
-    <branch module="libgnomecanvas/tags/LIBGNOMECANVAS_2_14_1/"/>
+    <branch tag="LIBGNOMECANVAS_2_14_1"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="libart_lgpl"/>

Modified: trunk/modulesets/hildon.modules
==============================================================================
--- trunk/modulesets/hildon.modules	(original)
+++ trunk/modulesets/hildon.modules	Thu Nov 13 13:12:09 2008
@@ -56,11 +56,11 @@
   </autotools>
 
   <autotools id="openobex">
-    <branch repo="maemo.org-connectivity" module="openobex/tags/openobex-1.3osso1" checkoutdir="openobex-1.3osso1" />
+    <branch repo="maemo.org-connectivity" tag="openobex-1.3osso1" checkoutdir="openobex-1.3osso1" />
   </autotools>
 
   <autotools id="bluez-libs"> <!-- The .pc file is just called bluez. murrayc -->
-    <branch repo="maemo.org-connectivity" module="bluez-libs/tags/bluez-libs-3.7" checkoutdir="bluez-libs-3.7" />
+    <branch repo="maemo.org-connectivity" tag="bluez-libs-3.7" checkoutdir="bluez-libs-3.7" />
     <dependencies>
       <dep package="openobex" />
     </dependencies>