You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by cr...@apache.org on 2003/09/04 06:23:56 UTC
cvs commit: xml-commons/java resolver.xml which.xml
crossley 2003/09/03 21:23:56
Modified: . build.xml
java resolver.xml which.xml
Log:
Copy the javadocs for the components so that the website docs and the
distribution docs can consistently link to them.
Revision Changes Path
1.8 +6 -10 xml-commons/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-commons/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 3 Sep 2003 02:17:47 -0000 1.7
+++ build.xml 4 Sep 2003 04:23:56 -0000 1.8
@@ -38,10 +38,11 @@
<!-- Overall distribution unit -->
<property name="dist.basename" value="xml-commons-${version}"/>
<property name="dist.dir" value="${tmp.dir}/build"/>
+ <property name="site.dir" value="${dist.dir}/site"/>
<!-- Public Targets -->
<target name="all"
- depends="docs,jars,dist"
+ depends="site,jars,javadocs,dist"
description="Default all target; calls every sub-build file directly.">
</target>
@@ -71,9 +72,6 @@
<fileset dir="java/"/>
</copy>
- <!-- Copy the documentation that has already been built by Forrest -->
- <!-- No need, because forrest builds directly into ${dist.dir}/site/ -->
-
<!-- Copy pertinent top-level files -->
<copy todir="${dist.dir}/${dist.basename}">
<fileset dir="." includes="KEYS,README.html,build.xml"/>
@@ -105,13 +103,11 @@
</ant>
</target>
- <target name="docs">
- <!-- call forrest to prepare the docs -->
- <ant target="site" />
-
+ <target name="javadocs">
<!-- copy the various javadocs into the website docs -->
-<!-- FIXME: not yet done -->
-
+ <copy todir="${site.dir}/components/apidocs">
+ <fileset dir="java/build/apidocs"/>
+ </copy>
</target>
<!-- import the Forrest build targets -->
1.7 +12 -5 xml-commons/java/resolver.xml
Index: resolver.xml
===================================================================
RCS file: /home/cvs/xml-commons/java/resolver.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- resolver.xml 3 Sep 2003 02:23:13 -0000 1.6
+++ resolver.xml 4 Sep 2003 04:23:56 -0000 1.7
@@ -27,7 +27,7 @@
<property name="build.etc.dir" value="${build.classes.dir}/org/apache/xml/resolver/etc"/>
<property name="docs.dir" value="${build.dir}"/>
<property name="docs.user.dir" value="${docs.dir}/docs"/>
- <property name="docs.java.dir" value="${docs.user.dir}/apidocs"/>
+ <property name="docs.java.dir" value="${docs.dir}/apidocs/resolver"/>
<property name="docs.site.dir" value="../build/site"/>
<property name="dist.basename" value="${name.resolver}-${impl.version}"/>
@@ -151,6 +151,9 @@
<target name="htmldocs" depends="jar">
<echo message="Building docs for ${name.resolver} ..." />
+<!-- Note: The docs are built in two ways until we stabilise the doc generation.
+Both ways have system-specific pathnames, so both may bust on your system.
+-->
<java fork="true" classname="org.apache.xalan.xslt.Process">
<classpath>
<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xml-apis.jar"/>
@@ -190,11 +193,12 @@
<arg value="/sourceforge/docbook/xsl/html/docbook.xsl"/>
</java>
- <!-- Copy the docs that forrest built -->
+ <!-- Copy the docs that Forrest built.
+ The top-level build has already executed the forrest site target. -->
<copy todir="${build.dir}/docs">
<fileset dir="${docs.site.dir}/components/resolver"
includes="resolver-*.html"/>
- </copy>
+ </copy>
</target>
@@ -213,7 +217,10 @@
<!-- Copy docs/javadocs -->
<copy todir="${build.dir}/${dist.basename}/docs">
<fileset dir="${docs.user.dir}"/>
- </copy>
+ </copy>
+ <copy todir="${build.dir}/${dist.basename}/apidocs/resolver">
+ <fileset dir="${docs.java.dir}"/>
+ </copy>
<!-- Copy pertinent top-level files and the .jar -->
<copy todir="${build.dir}/${dist.basename}">
1.5 +2 -2 xml-commons/java/which.xml
Index: which.xml
===================================================================
RCS file: /home/cvs/xml-commons/java/which.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- which.xml 7 Aug 2002 19:24:39 -0000 1.4
+++ which.xml 4 Sep 2003 04:23:56 -0000 1.5
@@ -27,7 +27,7 @@
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="docs.dir" value="${build.dir}"/>
<property name="docs.user.dir" value="${docs.dir}/docs"/>
- <property name="docs.java.dir" value="${docs.user.dir}/javadocs"/>
+ <property name="docs.java.dir" value="${docs.dir}/apidocs/which"/>
<property name="docs.printer.dir" value="${docs.user.dir}/printer"/>
<!-- Source constants and directories -->