[jhbuild] Replicate checkoutdir directory trees below buildroot

[Craig Keogh <cskeogh src gnome org>]

commit c5db5e1dcdc82557528ab76a90da90a84699fc75
Author: Dirk Wallenstein <halsmit t-online de>
Date:   Mon Sep 27 13:43:37 2010 +0200

    Replicate checkoutdir directory trees below buildroot
    
    When using an external buildroot, use the same directory layout as for
    checkoutroot. This will prevent clashes when repositories have the same
    basename. Add this behavior to all modtypes that already support an
    external build directory.
    
    Signed-off-by: Dirk Wallenstein <halsmit t-online de>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=630726

 doc/C/jhbuild.xml             |    2 +-
 jhbuild/modtypes/ant.py       |    2 +-
 jhbuild/modtypes/autotools.py |    2 +-
 jhbuild/modtypes/cmake.py     |    2 +-
 jhbuild/modtypes/distutils.py |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/doc/C/jhbuild.xml b/doc/C/jhbuild.xml
index f214fd3..cc0b44f 100644
--- a/doc/C/jhbuild.xml
+++ b/doc/C/jhbuild.xml
@@ -1606,7 +1606,7 @@ libgnomecanvas is missing branch definition for gnome-2-20
 	    pattern used to generate build directory names.  This is
 	    only used when using separate source and build trees.  The
 	    <literal>%s</literal> in the format string will be
-	    replaced with the source directory name.  Defaults to
+	    replaced with <varname>checkoutdir</varname>.  Defaults to
 	    <literal>'%s'</literal>.</simpara>
 	  </listitem>
 	</varlistentry>
diff --git a/jhbuild/modtypes/ant.py b/jhbuild/modtypes/ant.py
index d498bbc..0684d17 100644
--- a/jhbuild/modtypes/ant.py
+++ b/jhbuild/modtypes/ant.py
@@ -51,7 +51,7 @@ class AntModule(Package, DownloadableModule):
     def get_builddir(self, buildscript):
         if buildscript.config.buildroot and self.supports_non_srcdir_builds:
             d = buildscript.config.builddir_pattern % (
-                os.path.basename(self.get_srcdir(buildscript)))
+                self.branch.checkoutdir or self.branch.get_module_basename())
             return os.path.join(buildscript.config.buildroot, d)
         else:
             return self.get_srcdir(buildscript)
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 4cbf89a..c07e5ab 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -73,7 +73,7 @@ class AutogenModule(Package, DownloadableModule):
     def get_builddir(self, buildscript):
         if buildscript.config.buildroot and self.supports_non_srcdir_builds:
             d = buildscript.config.builddir_pattern % (
-                os.path.basename(self.get_srcdir(buildscript)))
+                self.branch.checkoutdir or self.branch.get_module_basename())
             return os.path.join(buildscript.config.buildroot, d)
         else:
             return self.get_srcdir(buildscript)
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index ad02632..4d8d719 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -51,7 +51,7 @@ class CMakeModule(Package, DownloadableModule):
     def get_builddir(self, buildscript):
         if buildscript.config.buildroot:
             d = buildscript.config.builddir_pattern % (
-                os.path.basename(self.get_srcdir(buildscript)))
+                self.branch.checkoutdir or self.branch.get_module_basename())
             return os.path.join(buildscript.config.buildroot, d)
         else:
             return self.get_srcdir(buildscript)
diff --git a/jhbuild/modtypes/distutils.py b/jhbuild/modtypes/distutils.py
index 455cbca..036a794 100644
--- a/jhbuild/modtypes/distutils.py
+++ b/jhbuild/modtypes/distutils.py
@@ -50,7 +50,7 @@ class DistutilsModule(Package, DownloadableModule):
     def get_builddir(self, buildscript):
         if buildscript.config.buildroot and self.supports_non_srcdir_builds:
             d = buildscript.config.builddir_pattern % (
-                os.path.basename(self.get_srcdir(buildscript)))
+                self.branch.checkoutdir or self.branch.get_module_basename())
             return os.path.join(buildscript.config.buildroot, d)
         else:
             return self.get_srcdir(buildscript)