[libcofoja-java] 11/14: Updated debian/rules to the latest Ant build script

[Emmanuel Bourg]

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

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

commit e39c1beb35b800bec529d07f779939367953033f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 11:20:27 2016 +0200

    Updated debian/rules to the latest Ant build script
---
 debian/changelog |  1 +
 debian/rules     | 32 +++++++++++---------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd7ff51..daf19d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ cofoja (1.3-1) UNRELEASED; urgency=medium
     - Removed 02-java8-compatibility.patch (fixed upstream)
     - Replaced 01-remove-version-from-generated-jar.patch with a build parameter
     - Depend on ASM instead of embedding the library
+    - Updated debian/rules to the latest Ant build script
   * Standards-Version updated to 3.9.8
   * Updated the Homepage field
   * Use secure Vcs-* URLs
diff --git a/debian/rules b/debian/rules
index b88ee25..2a3e861 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,33 +3,23 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@  --with javahelper --buildsystem ant
+	dh $@ --buildsystem=ant --with javahelper
+
+override_dh_auto_configure:
+	# Install the dependencies in the lib directory instead of using Ivy
+	mkdir -p lib
+	ln -s /usr/share/java/junit4.jar   lib/junit.jar
+	ln -s /usr/share/java/asm4-all.jar lib/asm-all.jar
 
 override_dh_auto_build:
-	# build unannotated cofoja library
-	dh_auto_build -- -Dasm.jar=/usr/share/java/asm4-all.jar \
-                         -Dcofoja.bare.jar=dist/cofoja.jar \
-                         -Djunit.jar=/usr/share/java/junit4.jar
+	dh_auto_build -- dist -Dcofoja.bare.jar=dist/cofoja.jar
 
-	# rebuild using the library.
-	mv dist/cofoja.jar build/bootstrap.jar
-	dh_auto_build -- -Dasm.jar=/usr/share/java/asm4-all.jar \
-                         -Djunit.jar=/usr/share/java/junit4.jar \
-                         -Dant.build.javac.source=1.7 \
-                         -Dant.build.javac.target=1.7 \
-                         clean bootstrap
-	mv dist/ccofoja.jar dist/cofoja.jar
+override_dh_auto_test:
+	dh_auto_build -- test
 
 override_dh_auto_clean:
-	-rm build/bootstrap.jar
 	dh_auto_clean
-
-override_dh_auto_test:
-	ant -Dasm.jar=/usr/share/java/asm4-all.jar \
-	    -Djunit.jar=/usr/share/java/junit4.jar \
-	    -Dant.build.javac.source=1.7 \
-	    -Dant.build.javac.target=1.7 \
-	    test
+	rm -Rf lib
 
 get-orig-source:
 	uscan --download-current-version --rename

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