CVS asm/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/asm/debian
In directory haydn:/tmp/cvs-serv1233/debian

Modified Files:
	control rules 
Added Files:
	ant.properties libasm-java-doc.doc-base 
Log Message:
Changed rules to have explicit build commands for java.
Removed extraneous dh_make template for asm.doc-base.
Added debian/ant.properties to control build properties.
Added libasm-java-doc.doc-base to register docs in system.


--- /cvsroot/pkg-java/asm/debian/control	2005/08/17 04:20:51	1.3
+++ /cvsroot/pkg-java/asm/debian/control	2005/08/18 00:43:00	1.4
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marcus Crafter <crafterm at debian.org>, Barry Hawkins <barry at bytemason.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), libant1.6-java, kaffe, sharutils
+Build-Depends-Indep: debhelper (>= 4.0.0), ant, kaffe, sharutils
 Standards-Version: 3.6.2
 
 Package: libasm-java
--- /cvsroot/pkg-java/asm/debian/rules	2005/08/17 03:51:48	1.1.1.1
+++ /cvsroot/pkg-java/asm/debian/rules	2005/08/18 00:43:00	1.2
@@ -4,8 +4,29 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
+# Set a locale; currently using default
+export LANG=C
+
+# Set JAVA_HOME to be used for Java commands
+JAVA_HOME=/usr/lib/kaffe
+
+# Set the invocation of the java command
+JAVACMD=${JAVA_HOME}/bin/java
+
+JAVA_LIB=/usr/share/java
+ANT_HOME=/usr/share/ant
+ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar
+
+# Set path to Ant properties file
+ANT_PROPS=debian/ant.properties
+
+# Universal Ant invocation for reliable builds;
+# place '-verbose' before -propertyfile to 
+# obtain detailed build output.
+ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
+        org.apache.tools.ant.Main -verbose -propertyfile $(ANT_PROPS)
 
 configure: configure-stamp
 configure-stamp:
@@ -31,7 +52,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	ant clean
+	$(ANT) clean
 	rm -f ow_util_ant_tasks.jar
 
 	dh_clean 
@@ -49,13 +70,12 @@
 	#for i in archive/*.xml.in \
 	#do \
 	#done \
-	
+
 	uudecode debian/ow_util_ant_tasks.uue > ow_util_ant_tasks.jar	
-	ant dist
+	$(ANT) dist
 
 	# install the libasm-java jar files
 	mv output/dist/lib/*.jar $(CURDIR)/debian/libasm-java/usr/share/java
-	
 	# install the javadocs and examples
 	mkdir $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc/javadoc
 	mv output/dist/doc/javadoc/user/* $(CURDIR)/debian/libasm-java-doc/usr/share/doc/libasm-java-doc/javadoc