[debhelper-devel] [debhelper] 03/03: Support auto-detection of whitelisted build-systems

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 1fa6f3b722358fe9234c5da4e68211e8b25c9374
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Aug 14 07:46:48 2016 +0000

    Support auto-detection of whitelisted build-systems
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Buildsystems.pm | 8 ++++++++
 debian/changelog                    | 4 ++++
 doc/PROGRAMMING                     | 7 +++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 784b0e2..0ced0e1 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -31,6 +31,11 @@ our @BUILDSYSTEMS = (
 	"qmake_qt4",
 );
 
+our @THIRD_PARTY_BUILDSYSTEMS = (
+	'maven',
+	'gradle',
+);
+
 my $opt_buildsys;
 my $opt_sourcedir;
 my $opt_builddir;
@@ -98,6 +103,9 @@ sub load_buildsystem {
 		foreach $system (@BUILDSYSTEMS) {
 			push @buildsystems, create_buildsystem_instance($system, 1, @_);
 		}
+		foreach $system (@THIRD_PARTY_BUILDSYSTEMS) {
+			push @buildsystems, create_buildsystem_instance($system, 0, @_);
+		}
 		return autoselect_buildsystem($step, @buildsystems);
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index 65e8c12..eaa2184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ debhelper (9.20160709+unreleased) UNRELEASED; urgency=medium
     PERL_USE_UNSAFE_INC to fix a further set of packages
     which fail to build with . removed from @INC.
     (Closes: #832436)
+  * Dh_Buildsystems.pm: Enable auto-detection of the maven
+    and gradle buildsystems (provided they are installed).
+    Thanks to Emmanuel Bourg for the suggestion.
+    (Closes: #801732)
 
  -- Niels Thykier <niels at thykier.net>  Sat, 09 Jul 2016 11:51:46 +0000
 
diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index 9944929..f530b94 100644
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -378,7 +378,10 @@ check_auto_buildable, configure, build, test, install, clean. See the comments
 inside Debian::Debhelper::Buildsystem for details. Note that this interface
 is still subject to change.
 
-Note that third-party buildsystems will not automatically be used by default,
-but can be forced to be used via the --buildsystem parameter.
+Note that third-party buildsystems will not automatically be used by
+default.  The package maintainer will either have to explicitly enable
+it via the --buildsystem parameter OR the build system should be
+registered in debhelper.  The latter is currently needed to ensure a
+stable and well-defined ordering of the build systems.
 
 -- Joey Hess <joeyh at debian.org>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git