CVS lucene/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/lucene/debian
In directory haydn:/tmp/cvs-serv11628/debian

Modified Files:
      Tag: RB_1_4_3
	rules 
Added Files:
      Tag: RB_1_4_3
	ant.properties 
Log Message:
Added use of ant.properties to rules file

--- /cvsroot/pkg-java/lucene/debian/rules	2005/01/05 03:47:11	1.3
+++ /cvsroot/pkg-java/lucene/debian/rules	2005/01/11 03:26:32	1.3.2.1
@@ -11,26 +11,29 @@
 
 VERSION=1.4.3
 PNAME=lucene
-JAVA_HOME=/usr/lib/j2sdk1.4-sun
 
-OVERRIDE=-Djavacc.jar.dir=/usr/share/java -Dversion=$(VERSION)
+# Set JAVA_HOME to be used for build
+JAVA_HOME=/usr/lib/j2sdk1.4-sun
 
 CURDIR=$(shell pwd)
 
+# Set path to Ant properties file
+ANT_PROPS=${CURDIR}/debian/ant.properties
+
 build: build-stamp
 
 build-stamp:
 	dh_testdir
-	export JAVA_HOME=$(JAVA_HOME) && ant  javacc $(OVERRIDE)
-	export JAVA_HOME=$(JAVA_HOME) && ant package $(OVERRIDE)
-	export JAVA_HOME=$(JAVA_HOME) && ant -lib lib test $(OVERRIDE)
+	export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} javacc
+	export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} package
+	export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} -lib lib test 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-	export JAVA_HOME=$(JAVA_HOME) && ant clean $(OVERRIDE)
+	export JAVA_HOME=$(JAVA_HOME) && ant -propertyfile ${ANT_PROPS} clean
 	dh_clean
 	rm -rf $(CURDIR)/debian/lib$(PNAME)-java/usr/share/java
 	rm -rf $(CURDIR)/debian/lib$(PNAME)-java/var/lib/tomcat4/webapps