[ecj] 71/145: Removed the option to build with the old ant1.7 package

[Emmanuel Bourg]

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

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

commit bded7de6d75f7287098158a70e63af540fc772a8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 26 13:24:03 2014 +0200

    Removed the option to build with the old ant1.7 package
---
 debian/changelog | 6 ++++--
 debian/rules     | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 025832a..f24fe11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ ecj (3.9.0-3) UNRELEASED; urgency=medium
   * Call 'set -e' in the body of the ecj maintainer scripts
   * Fixed a typo in the ecj manpages
   * Added a watch file
-  * debian/rules: Renamed the get-source target to get-orig-source
-    and completed the script to build the upstream tarball.
+  * debian/rules:
+    - Renamed the get-source target to get-orig-source and completed
+      the script to build the upstream tarball.
+    - Removed the option to build with the old ant1.7 package
   * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 26 Jun 2014 01:40:40 +0200
diff --git a/debian/rules b/debian/rules
index d7a9334..baac3c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,6 @@ LIBGCJ_SOVER  = $(LIBGCJ_EXT)
 LIBGCJ_SOVER  = 15
 REQ_VERSION   = 4.4.6
 
-ant_version = 1.7
-ant_version =
 GCJ = gcj-$(GCC_VERSION)
 GIJ = gij-$(GCC_VERSION)
 GCJDBTOOL = gcj-dbtool-$(GCC_VERSION)
@@ -79,11 +77,11 @@ ifeq ($(with_sourcebuild),yes)
 	for list in $$(find build/bin -name 'ecj-sources.*'); do \
 	    echo "building files in $$list ..."; \
 	    echo $(GCJ) -d build/bin -C -g \
-		-I/usr/share/ant$(ant_version)/lib/ant.jar \
+		-I/usr/share/ant/lib/ant.jar \
 		-Ibuild/bin \
 		$$(cat $$list); \
 	    $(GCJ) -v -d build/bin -C -g \
-		-I/usr/share/ant$(ant_version)/lib/ant.jar \
+		-I/usr/share/ant/lib/ant.jar \
 		-Ibuild/bin \
 		$$(cat $$list); \
 	done
@@ -106,7 +104,7 @@ ifeq ($(with_sourcebuild),yes)
 	rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
 
 	time $(GIJ) \
-	    -classpath build/bootstrap/$(JAR):/usr/share/ant$(ant_version)/lib/ant.jar \
+	    -classpath build/bootstrap/$(JAR):/usr/share/ant/lib/ant.jar \
 	    org.eclipse.jdt.internal.compiler.batch.Main \
 	    -bootclasspath /usr/share/java/libgcj-$(GCC_VERSION).jar \
 	    build/bin

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