[pkg-java] r17931 - trunk/ca-certificates-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-24 15:44:24 +0000 (Mon, 24 Mar 2014)
New Revision: 17931

Modified:
   trunk/ca-certificates-java/debian/rules
Log:
Adapted debian/rules to the Maven layout



Modified: trunk/ca-certificates-java/debian/rules
===================================================================
--- trunk/ca-certificates-java/debian/rules	2014-03-24 15:18:00 UTC (rev 17930)
+++ trunk/ca-certificates-java/debian/rules	2014-03-24 15:44:24 UTC (rev 17931)
@@ -29,11 +29,16 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	jh_build $(OPTS) ca-certificates-java.jar .
+	mkdir target
+	jh_build $(OPTS) target/ca-certificates-java.jar src/main/java
 ifeq ($(do_junit),yes)
-	$(JAVA_HOME)/bin/java -cp /usr/share/java/junit4.jar:./ca-certificates-java.jar \
+	jh_build --no-javadoc --javacopts="-source 1.6 -target 1.6 -cp target/ca-certificates-java.jar:${CLASSPATH}" \
+	         target/ca-certificates-java-tests.jar src/test/java
+	mkdir target/test-classes
+	cp -R src/test/resources/* target/test-classes
+	$(JAVA_HOME)/bin/java -cp /usr/share/java/junit4.jar:target/ca-certificates-java.jar:target/ca-certificates-java-tests.jar \
 	org.junit.runner.JUnitCore \
-	org.debian.security.UpdateCertificatesTest
+	org.debian.security.UpdateCertificatesTest org.debian.security.KeyStoreHandlerTest
 endif
 	touch $@
 
@@ -41,7 +46,7 @@
 	dh_testdir
 	dh_testroot
 	jh_build --clean
-	$(RM) build-stamp
+	$(RM) -R build-stamp target
 	dh_clean
 	for f in debian/*.in; do \
 	  f2=$$(echo $$f | sed ';s/\.in$$//'); \
@@ -66,7 +71,7 @@
 		$(d)/etc/ca-certificates/update.d/jks-keystore
 	install -m600 debian/default \
 		$(d)/etc/default/cacerts
-	dh_install ca-certificates-java.jar /usr/share/ca-certificates-java/
+	dh_install target/ca-certificates-java.jar /usr/share/ca-certificates-java/
 
 # Build architecture-independent files here.
 binary-indep: build install