[jaxb] 01/01: various fixes to build

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository jaxb.

commit 7140fb69339d9b3cc5f7a535cac8c8c684d76ba7
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Sat Jan 18 14:07:47 2014 +0200

    various fixes to build
---
 debian/build-javadoc.xml                 | 17 ------------
 debian/libjaxb-java-doc.doc-base.javadoc |  9 -------
 debian/patches/fix-javadoc-build.diff    | 45 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             | 43 +++++++++++++-----------------
 5 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/debian/build-javadoc.xml b/debian/build-javadoc.xml
deleted file mode 100644
index 6411abb..0000000
--- a/debian/build-javadoc.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="javadoc" default="build">
-
-  <target name="build">
-    <mkdir dir="apidocs" />
-    <javadoc destdir="apidocs">
-      <fileset dir="runtime/src" includes="**/*.java"/>
-      <fileset dir="xjc/src" includes="**/*.java"/>
-    </javadoc>
-    <copy todir="apidocs">
-      <fileset dir="runtime/src" includes="**/doc-files/**/*"/>
-      <fileset dir="xjc/src" includes="**/doc-files/**/*"/>
-    </copy>
-  </target>
-
-</project>
diff --git a/debian/libjaxb-java-doc.doc-base.javadoc b/debian/libjaxb-java-doc.doc-base.javadoc
deleted file mode 100644
index 91ed1ac..0000000
--- a/debian/libjaxb-java-doc.doc-base.javadoc
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libjaxb-java-doc
-Title: API JavaDoc for libjaxb-java-doc
-Author: The authors of libjaxb-java-doc
-Abstract: This is the API JavaDoc for libjaxb-java-doc
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libjaxb-java-doc/api
-Files: /usr/share/doc/libjaxb-java-doc/api/*.html
diff --git a/debian/patches/fix-javadoc-build.diff b/debian/patches/fix-javadoc-build.diff
new file mode 100644
index 0000000..4a75a77
--- /dev/null
+++ b/debian/patches/fix-javadoc-build.diff
@@ -0,0 +1,45 @@
+From: Timo Aaltonen <tjaalton at ubuntu.com>
+Description: replace the javadoc target with something we can use, modify classpath to fit
+--- a/build.xml
++++ b/build.xml
+@@ -137,30 +137,21 @@
+         <fileset dir="${jaxb.libs.redist}" includes="*.jar"/>
+         <fileset dir="${jaxb.libs.rebundle}" includes="**/*.jar"/>
+         <fileset dir="${jaxb.libs.util}" includes="*.jar" excludes="ant.jar"/>
++        <fileset dir="dist/lib" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="*.jar"/>
+     </path>
+ 
+     <target name="javadoc">
+-        <ant dir="runtime" target="javadoc" />
+-        <ant dir="xjc"     target="javadoc" />
+-        <zip zipfile="${jaxb.dist}/lib/jaxb-impl-javadoc.jar">
+-            <fileset dir="${runtime.root}/build/api"/>
+-        </zip>
+-        <zip zipfile="${jaxb.dist}/lib/jaxb-xjc-javadoc.jar">
+-            <fileset dir="${xjc.root}/build/javadoc"/>
+-        </zip>
+-        
+-        <unzip src="${jaxb.dist}/lib/jaxb1-impl-src.zip" dest="${jaxb.build}/jaxb1src"/>
+-        <mkdir dir="${jaxb.build}/jaxb1api" />
+-        <javadoc destdir="${jaxb.build}/jaxb1api" use="true" defaultexcludes="yes"
+-            author="false" version="false" windowtitle="JAXB 1 RI runtime"
+-            useexternalfile="true" access="public">
+-            <fileset dir="${jaxb.build}/jaxb1src" includes="com/sun/xml/bind/*.java"/>
++        <mkdir dir="apidocs" />
++        <javadoc destdir="apidocs">
++            <fileset dir="runtime/src" includes="**/*.java"/>
++            <fileset dir="xjc/src" includes="**/*.java"/>
+             <classpath refid="javac.classpath"/>
+-            <arg value="-quiet"/>
+         </javadoc>
+-        <zip zipfile="${jaxb.dist}/lib/jaxb1-impl-javadoc.jar">
+-            <fileset dir="${jaxb.build}/jaxb1api"/>
+-        </zip>
++        <copy todir="apidocs">
++            <fileset dir="runtime/src" includes="**/doc-files/**/*"/>
++            <fileset dir="xjc/src" includes="**/doc-files/**/*"/>
++        </copy>
+     </target>
+ 
+     <target name="src-zip" depends="init-standalone,dist"
diff --git a/debian/patches/series b/debian/patches/series
index 5b4d1e0..1dbaa5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ remove-classpath-from-manifests.patch
 add-dependencies.patch
 dont-use-prebuilt-javadocs.patch
 dont-build-examples.patch
+fix-javadoc-build.diff
diff --git a/debian/rules b/debian/rules
index 46056b9..6fee762 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ VERSION = $(shell dpkg-parsechangelog |grep Version| sed 's/.*: //;s/-.*//')
 	dh $@ --with javahelper
 
 override_dh_auto_build:
+	mkdir tools/lib/redist
+	# these are best handled here
 	ln -s /usr/share/java/codemodel.jar tools/lib/rebundle/compiler/codemodel.jar
 	ln -s /usr/share/java/dtd-parser.jar tools/lib/rebundle/compiler/dtd-parser.jar
 	ln -s /usr/share/java/istack-commons-tools.jar tools/lib/rebundle/compiler/istack-commons-tools.jar
@@ -32,34 +34,26 @@ override_dh_auto_build:
 	ln -s /usr/share/java/relaxngcc.jar tools/lib/util/relaxngcc.jar
 	ln -s /usr/share/java/stax-ex.jar tools/lib/util/stax-ex.jar
 	ln -s /usr/share/java/txwc2.jar tools/lib/util/txwc2.jar
-	ln -s debian/build-javadoc.xml .
 
-	ant -Dbuild.sysclasspath=last -Dbuild.number=1 dist
-	ant -Dbuild.sysclasspath=last -f build-javadoc.xml
-
-override_dh_clean:
-	dh_clean
-	-rm -rf apidocs
-	-rm -rf `find . -name "*.jar"`
-	-rm -rf `find . -name "*.class"`
-	-rm -rf `find . -name "*.zip"`
-	-rm -rf ./xjc/build
-	-rm -rf ./runtime/build
-	-rm -rf ./runtime-deprecated/build
-	-rm -rf ./dist
-	-rm -f xjc/manifest.xjc
+	dh_auto_build -- \
+		-Dbuild.sysclasspath=last -Dbuild.number=1 \
+		-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+		dist javadoc
 
 clean::
 	dh_clean
-	-rm -rf apidocs
-	-rm -rf `find . -name "*.jar"`
-	-rm -rf `find . -name "*.class"`
-	-rm -rf `find . -name "*.zip"`
-	-rm -rf ./xjc/build
-	-rm -rf ./runtime/build
-	-rm -rf ./runtime-deprecated/build
-	-rm -rf ./dist
-	-rm -f xjc/manifest.xjc
+	jh_clean
+	mh_clean
+	rm -rf apgen/build \
+		apidocs \
+		dist \
+		runtime*/build  \
+		tools/*/build \
+		xjc/build
+	rm -rf `find . -name "*.jar"`
+	rm -rf `find . -name "*.class"`
+	rm -f xjc/manifest.xjc
+	rm -rf tools/lib/redist
 
 override_dh_install:
 	dh_install
@@ -69,4 +63,3 @@ override_dh_install:
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-

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