CVS commons-httpclient/debian

[Barry Hawkins]

Update of /cvsroot/pkg-java/commons-httpclient/debian
In directory haydn:/tmp/cvs-serv23645/debian

Modified Files:
	control rules 
Log Message:
Reworked rules file to build with kaffe

--- /cvsroot/pkg-java/commons-httpclient/debian/control	2005/09/02 03:18:48	1.2
+++ /cvsroot/pkg-java/commons-httpclient/debian/control	2005/09/14 02:55:34	1.3
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Barry Hawkins <barry at bytemason.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), cdbs, libcommons-logging-java, libant1.6-java, jikes (>= 1.15), kaffe (>= 1.0.6), junit
+Build-Depends-Indep: debhelper (>> 3.0.0), libcommons-logging-java, ant, jikes (>= 1.15), kaffe (>= 1.0.6), junit
 Standards-Version: 3.6.2
 
 Package: libcommons-httpclient-java
 Architecture: all
 Suggests: libcommons-httpclient-java-doc
-Depends: kaffe (>=1:1.1.3) | java2-runtime, libcommons-logging-java
+Depends: kaffe (>=2:1.1.5) | java2-runtime, libcommons-logging-java
 Description: A Java(TM) library for creating HTTP clients
  The Jakarta Commons HTTPClient library provides an efficient,
  up-to-date, and feature-rich package implementing the client side of
--- /cvsroot/pkg-java/commons-httpclient/debian/rules	2005/09/02 05:53:16	1.3
+++ /cvsroot/pkg-java/commons-httpclient/debian/rules	2005/09/14 02:55:34	1.4
@@ -5,32 +5,95 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
 PNAME=commons-httpclient
 VERSION=2.0.2
-JARFILE=$(PNAME)-$(VERSION).jar
+JARFILE=$(PNAME)-${VERSION}.jar
 BUILDFILE=build.xml
 
-# Must specify these
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
-JAVA_LIB := /usr/share/java
-
-# Additional JARs
-DEB_JARS := ${ANT_HOME}/lib/ant-launcher.jar commons-logging ${JAVA_LIB}/junit.jar
-
-# Build compiler
-DEB_ANT_COMPILER := jikes
 
-DEB_ANT_BUILD_TARGET := compile
+# Set the JAVA_HOME to be used for Java commands
+JAVA_HOME=/usr/lib/kaffe
 
-# Testing on Kaffe seems to hang...
-DEB_ANT_CHECK_TARGET := test
+# Set the invocation of the java command
+JAVACMD=$(JAVA_HOME)/bin/java
 
-DEB_ANT_INSTALL_TARGET := dist
+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)/commons-logging.jar:$(JAVA_LIB)/junit.jar:/usr/share/kaffe/Klasses.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)
+
+export JAVAC=jikes
+
+debian/ssl-stub/ssl-stub.jar:
+	# OK, we need the JSSE for this to compile.  But we can't
+	# redistribute JSSE, and can't require it for the build.  So
+	# this is a workaround, creating stub classes for this compilation.
+	(cd debian/ssl-stub; $(ANT))
+
+build: build-stamp
+build-stamp: debian/ssl-stub/ssl-stub.jar
+	dh_testdir
+
+	# Normally we could do just 'ant dist', but this subproject
+	# doesn't build all by itself. 
+	$(ANT) compile doc
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	$(ANT) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/commons-httpclient.
+	${JAVA_HOME}/bin/jar cf \
+	        $(CURDIR)/debian/lib${PNAME}-java/usr/share/java/${JARFILE} \
+		-C target/classes org
+
+	# Build the documentation
+	mkdir -p $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/
+	cp -aRf dist/docs/api $(CURDIR)/debian/lib${PNAME}-java-doc/usr/share/doc/lib${PNAME}-java-doc/
+
+	dh_movefiles --sourcedir=debian/lib${PNAME}-java
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+	dh_installchangelogs  -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
 
-install/lib$(PNAME)-java::
-	install -m 644 dist/$(PNAME).jar debian/$(cdbs_curpkg)/usr/share/java/$(JARFILE)
-	ln -s $(JARFILE) debian/$(cdbs_curpkg)/usr/share/java/$(PNAME).jar
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install