[debhelper-devel] [debhelper] 01/01: The ant buildsystem now loads d/ant.properties

[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 a04b4f887641fc1fbd92b3ccd5eb3cd0ef954b8b
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 3 11:35:21 2015 +0100

    The ant buildsystem now loads d/ant.properties
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/ant.pm | 14 ++++++++++++--
 debian/changelog                    |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/ant.pm b/Debian/Debhelper/Buildsystem/ant.pm
index c273313..212aa10 100644
--- a/Debian/Debhelper/Buildsystem/ant.pm
+++ b/Debian/Debhelper/Buildsystem/ant.pm
@@ -26,12 +26,22 @@ sub new {
 
 sub build {
 	my $this=shift;
-	$this->doit_in_sourcedir("ant", @_);
+	my $d_ant_prop = $this->get_sourcepath('debian/ant.properties');
+	my @args;
+	if ( -f $d_ant_prop ) {
+		push(@args, '-propertyfile', $d_ant_prop);
+	}
+	$this->doit_in_sourcedir("ant", @args, @_);
 }
 
 sub clean {
 	my $this=shift;
-	$this->doit_in_sourcedir("ant", "clean", @_);
+	my $d_ant_prop = $this->get_sourcepath('debian/ant.properties');
+	my @args;
+	if ( -f $d_ant_prop ) {
+		push(@args, '-propertyfile', $d_ant_prop);
+	}
+	$this->doit_in_sourcedir("ant", @args, "clean", @_);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index a2d828e..9620d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
   * dh_fixperms: Correct permissions of reportbug files and scripts.
     Thanks to Fabian Greffrath for the report and a basic patch.
     (Closes: #459548)
+  * The "ant" build system now loads debian/ant.properties
+    automatically before build and clean (like CDBS).  Thanks to
+    Thomas Koch for the report.  (Closes: #563909)
 
   [ Bernhard R. Link ]
   * Dh_lib: apply patch from Guillem Jover to support case-insensitive

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