diff options
| author | Niels Thykier <niels@thykier.net> | 2015-01-03 11:35:21 +0100 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2015-01-03 11:35:40 +0100 |
| commit | a04b4f887641fc1fbd92b3ccd5eb3cd0ef954b8b (patch) | |
| tree | 26d0b0201dcf18a948bd77285edce569d62d7017 | |
| parent | b6d340c6dd21257381e07dc881e5e7b64e9aac3b (diff) | |
| download | debhelper-a04b4f887641fc1fbd92b3ccd5eb3cd0ef954b8b.tar.gz | |
The ant buildsystem now loads d/ant.properties
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | Debian/Debhelper/Buildsystem/ant.pm | 14 | ||||
| -rw-r--r-- | 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 c2733133..212aa100 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 a2d828ea..9620d63a 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 |