[pkg-java] r3792 - in trunk/aspectj/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-07-04 18:44:57 +0000 (Wed, 04 Jul 2007)
New Revision: 3792

Modified:
   trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
   trunk/aspectj/debian/rules
Log:
the whole documentation is now correctly generated.


Modified: trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
===================================================================
--- trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-07-04 17:41:56 UTC (rev 3791)
+++ trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-07-04 18:44:57 UTC (rev 3792)
@@ -1,6 +1,61 @@
---- aspectj.orig/org.aspectj/modules/docs/build.xml
-+++ aspectj/org.aspectj/modules/docs/build.xml
-@@ -500,20 +500,21 @@
+--- org.aspectj/modules/docs/build.xml-	2007-07-04 20:24:07.000000000 +0200
++++ org.aspectj/modules/docs/build.xml	2007-07-04 20:30:28.000000000 +0200
+@@ -69,10 +69,6 @@
+         <property name="nochunk.xsl.source"
+                   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"
+-                  location="${docs.temp.dir}/xml-target-file.dummy"
+-        />
+         <!-- default value for xml-html copying (copy all graphics) -->
+         <property name="xml-html-copy" value="*.gif,*.png" />
+         <property name="xml-html-stylesheet" value="aspectj-docs.css" />
+@@ -273,7 +269,7 @@
+                    value="${nochunk.xsl.source}"
+             />
+             <param name="xml-target-dir" value="${docs.dist.dir}" />
+-            <param name="xml-target-file"
++            <param name="xml-target"
+                    value="${docs.dist.dir}/doc/faq.html"
+             />
+             <param name="xml-html-stylesheet" value="aspectj-faq.css" />
+@@ -359,6 +355,9 @@
+             <param name="xml-target-dir"
+                    value="${docs.dist.dir}/doc/${guide.name}"
+             />
++            <param name="xml-target"
++                   value="${docs.dist.dir}/doc/${guide.name}/"
++            />
+         </antcall>
+         <!-- single -->
+         <antcall target="xml-html">
+@@ -372,7 +371,7 @@
+             <param name="xml-target-dir"
+                    value="${docs.dist.dir}/doc/${guide.name}"
+             />
+-            <param name="xml-target-file"
++            <param name="xml-target"
+                    value="${docs.dist.dir}/doc/${guide.name}/printable.html"
+             />
+         </antcall>
+@@ -483,13 +482,13 @@
+     </target>
+ 
+     <target name="xml-html"
+-            description="antcall(xml-source-dir, xml-source-root, xml-target-dir, xml-target-file)
++            description="antcall(xml-source-dir, xml-source-root, xml-target-dir, xml-target)
+      convert xml to html using docbook. parameters: 
+      xml-source-dir  # base directory of source 
+      xml-source-root # base file of source (relative to xml-source-dir)
+      xsl-source-file # xsl transform to apply (use chunk.xsl.source by default) 
+      xml-target-dir  # target directory for output (used as xsl param base.dir)
+-     xml-target-file # full path to output file in xml-source-dir, ignored when chunking
++     xml-target      # full path to output file or dir in xml-source-dir
+      xml-html-copy   # copy files to target (defaults to *.gif,*.png)
+      xml-html-stylesheet   # style sheet to use (defaults to ${xml-html-stylesheet})"
+     >
+@@ -500,20 +499,21 @@
                       includes="${xml-html-copy}"
              />
          </copy>
@@ -14,7 +69,7 @@
              <arg value="-o" />
 -            <arg value="${xml-target-file}" />
 -            <arg value="${xml-source-dir}/${xml-source-root}" />
-+            <arg value="${xml-target-file}" />
++            <arg value="${xml-target}" />
 +            <arg value="--stringparam" />
 +            <arg value="use.id.as.filename" />
 +            <arg value="1" />

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-07-04 17:41:56 UTC (rev 3791)
+++ trunk/aspectj/debian/rules	2007-07-04 18:44:57 UTC (rev 3792)
@@ -7,7 +7,7 @@
 JAVA_HOME := /usr/lib/jvm/java-gcj
 MODULES := org.aspectj/modules
 DEB_BUILDDIR = $(MODULES)/build
-DEB_COMPRESS_EXCLUDE = .pdf
+DEB_COMPRESS_EXCLUDE = .pdf .java .xml
 
 MKDIR := mkdir -p
 LN_S := ln -sf