[pkg-java] r3587 - trunk/aspectj/debian/patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-06-04 11:41:12 +0000 (Mon, 04 Jun 2007)
New Revision: 3587

Added:
   trunk/aspectj/debian/patches/03_use_system_docbook.diff
   trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
Log:
two new patches to fix documentation building


Added: trunk/aspectj/debian/patches/03_use_system_docbook.diff
===================================================================
--- trunk/aspectj/debian/patches/03_use_system_docbook.diff	                        (rev 0)
+++ trunk/aspectj/debian/patches/03_use_system_docbook.diff	2007-06-04 11:41:12 UTC (rev 3587)
@@ -0,0 +1,15 @@
+--- aspectj.orig/modules/docs/build.xml
++++ aspectj/modules/docs/build.xml
+@@ -64,10 +64,10 @@
+ 
+         <!-- callers of xml-html use these by default -->
+         <property name="chunk.xsl.source"
+-                  location="${aspectj.modules.lib.dir}/docbook/docbook-xsl/html/chunk.xsl"
++                  location="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"
+         />
+         <property name="nochunk.xsl.source"
+-                  location="${aspectj.modules.lib.dir}/docbook/docbook-xsl/html/docbook.xsl"
++                  location="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"
+         />
+         <!-- default xml-html nochunking file (0-length dummy created when chunking) -->
+         <property name="xml-target-file"

Added: trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
===================================================================
--- trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	                        (rev 0)
+++ trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-06-04 11:41:12 UTC (rev 3587)
@@ -0,0 +1,33 @@
+--- aspectj.orig/modules/docs/build.xml
++++ aspectj/modules/docs/build.xml
+@@ -500,20 +500,21 @@
+                      includes="${xml-html-copy}"
+             />
+         </copy>
+-        <java classname="com.icl.saxon.StyleSheet"
+-              classpath="${aspectj.modules.lib.dir}/saxon/saxon.jar"
+-              fork="yes"
++        <exec executable="xsltproc"
+               failonerror="yes"
+         >
+             <!-- todo: establish failure policy -->
+             <arg value="-o" />
+-            <arg value="${xml-target-file}" />
+-            <arg value="${xml-source-dir}/${xml-source-root}" />
++            <arg value="${xml-target-dir}/${xml-target-file}" />
++            <arg value="--stringparam" />
++            <arg value="use.id.as.filename" />
++            <arg value="1" />
++            <arg value="--stringparam" />
++            <arg value="html.stylesheet" />
++            <arg value="${xml-html-stylesheet}" />
+             <arg value="${xsl-source-file}" />
+-            <arg value="base.dir=${xml-target-dir}/" />
+-            <arg value="use.id.as.filename=1" />
+-            <arg value="html.stylesheet=${xml-html-stylesheet}" />
+-        </java>
++            <arg value="${xml-source-dir}/${xml-source-root}" />
++        </exec>
+     </target>
+ 
+ </project>