[ant] 09/17: Simplified the bootstrapping in debian/rules

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository ant.

commit c6a1e0253c17ba1cedece4864e11f994433c9362
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 14:30:07 2017 +0100

    Simplified the bootstrapping in debian/rules
---
 debian/changelog |  1 +
 debian/rules     | 21 ++++++---------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7120bc9..535fc45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ant (1.9.8-2) UNRELEASED; urgency=medium
   * Removed 0008-junit4-replace-assumeFalse.patch
   * Link the build dependencies to lib/optional as expected by the build
     and removed the classpath tweaks
+  * Simplified the bootstrapping in debian/rules
   * Removed the unused PACKAGE variable in debian/rules
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 Jan 2017 17:46:06 +0100
diff --git a/debian/rules b/debian/rules
index bd1fef6..a6f7e3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
   with_gcj_native := yes
 endif
 
-# needs to be exported for direct ant call
-export JAVA_HOME := /usr/lib/jvm/default-java
-# needed for bootstrap.sh
-export JAVAC=$(JAVA_HOME)/bin/javac
-# needed for bootstrap
-export BOOTJAVAC_OPTS=-source 1.5 -target 1.5 -nowarn
-# needed for building with bootstrap ant
-export ANT_HOME := bootstrap
-
 VERSION   := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*//')
 DATE      := $(shell dpkg-parsechangelog --show-field Date)
 TODAY     := $(shell date --date='$(DATE)' --utc +'%B %-d %Y')
@@ -34,15 +25,15 @@ override_dh_auto_configure:
 	    ln -s /usr/share/java/$$DEPENDENCY.jar lib/optional/$$DEPENDENCY.jar; \
 	done
 
-	# doing bootstrapping
-	install -d bootstrap/lib
-	/bin/sh bootstrap.sh
-	# the rest
-	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -propertyfile debian/ant.properties -DTODAY='${TODAY}' jars test-jar
+	# Bootstrapping
+	JAVA_HOME=/usr/lib/jvm/default-java ./bootstrap.sh
+
+	# Normal build
+	bootstrap/bin/ant -propertyfile debian/ant.properties -DTODAY='${TODAY}' jars test-jar
 
 override_dh_auto_build-arch:
 override_dh_auto_build-indep:
-	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -propertyfile debian/ant.properties javadocs
+	bootstrap/bin/ant -propertyfile debian/ant.properties javadocs
 
 override_dh_installdocs:
 	dh_installdocs --exclude=manual/LICENSE

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