jhbuild r2660 - in trunk: . jhbuild/versioncontrol modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Wed Jan 21 15:56:32 2009
New Revision: 2660
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2660&view=rev

Log:
* jhbuild/versioncontrol/tarball.py:
* modulesets/moduleset.dtd: added a new source-subdir attribute (for
tarball "version control"), required by Samba4 and related libraries.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/tarball.py
   trunk/modulesets/moduleset.dtd

Modified: trunk/jhbuild/versioncontrol/tarball.py
==============================================================================
--- trunk/jhbuild/versioncontrol/tarball.py	(original)
+++ trunk/jhbuild/versioncontrol/tarball.py	Wed Jan 21 15:56:32 2009
@@ -57,10 +57,10 @@
         self.href = config.repos.get(name, href)
 
     branch_xml_attrs = ['version', 'module', 'checkoutdir',
-                        'size', 'md5sum']
+                        'size', 'md5sum', 'source-subdir']
 
     def branch(self, name, version, module=None, checkoutdir=None,
-               size=None, md5sum=None, branch_id=None):
+               size=None, md5sum=None, branch_id=None, source_subdir=None):
         if name in self.config.branches:
             module = self.config.branches[name]
             if not module:
@@ -74,7 +74,7 @@
         return TarballBranch(self, module=module, version=version,
                              checkoutdir=checkoutdir,
                              source_size=size, source_md5=md5sum,
-                             branch_id=branch_id)
+                             branch_id=branch_id, source_subdir=source_subdir)
 
     def branch_from_xml(self, name, branchnode, repositories, default_repo):
         try:
@@ -103,7 +103,7 @@
     """A class representing a Tarball."""
 
     def __init__(self, repository, module, version, checkoutdir,
-                 source_size, source_md5, branch_id):
+                 source_size, source_md5, branch_id, source_subdir=None):
         Branch.__init__(self, repository, module, checkoutdir)
         self.version = version
         self.source_size = source_size
@@ -111,6 +111,7 @@
         self.patches = []
         self.quilt = None
         self.branch_id = branch_id
+        self.source_subdir = source_subdir
 
     def _local_tarball(self):
         basename = os.path.basename(self.module)
@@ -120,7 +121,7 @@
         return localfile
     _local_tarball = property(_local_tarball)
 
-    def srcdir(self):
+    def raw_srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
 
@@ -138,6 +139,12 @@
         if localdir.endswith('.src'):
             localdir = localdir[:-4]
         return localdir
+    raw_srcdir = property(raw_srcdir)
+
+    def srcdir(self):
+        if self.source_subdir:
+            return os.path.join(self.raw_srcdir, self.source_subdir)
+        return self.raw_srcdir
     srcdir = property(srcdir)
 
     def branchname(self):
@@ -234,7 +241,7 @@
             buildscript.set_action(_('Applying patch'), self, action_target=patch)
             buildscript.execute('patch -p%d < "%s"'
                                 % (patchstrip, patchfile),
-                                cwd=self.srcdir)
+                                cwd=self.raw_srcdir)
 
     def _quilt_checkout(self, buildscript):
         if not has_command('quilt'):

Modified: trunk/modulesets/moduleset.dtd
==============================================================================
--- trunk/modulesets/moduleset.dtd	(original)
+++ trunk/modulesets/moduleset.dtd	Wed Jan 21 15:56:32 2009
@@ -165,8 +165,9 @@
 	repo		CDATA	#IMPLIED
 	module		CDATA	#IMPLIED
 	checkoutdir	CDATA	#IMPLIED
-	override-checkoutdir (yes|no) "yes"
-	update-new-dirs (yes|no) "yes"
+	override-checkoutdir (yes|no) "yes"  <!-- CVS only -->
+	update-new-dirs (yes|no) "yes"       <!-- CVS only -->
+	source-subdir   CDATA   #IMPLIED     <!-- Tarballs only  -->
 	revision	CDATA	#IMPLIED
 	tag             CDATA   #IMPLIED
 	version		CDATA	#IMPLIED