dleslie 00/08/23 08:06:27
Modified: . build.xml
Log:
Added removal of contents of xml-site-style.tar.gz
and top/package-level Javadoc files to the clean target.
Added autodocs and autojavadocs targets so that docs and
javadocs targets can keep their dependency on package.
Put sample servlet (which I also put back into the repository!)
back in the samples target.
Revision Changes Path
1.29 +37 -26 xml-xalan/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 2000/08/23 13:11:33 1.28
+++ build.xml 2000/08/23 15:06:25 1.29
@@ -28,10 +28,12 @@
- javadocs [or apidocs] generates the API documentation in
./build/docs/apidocs
- dist creates a complete distribution in ./xalan-j_x_x_x
- site creates the site documentation tree in ./xml-site/target/xalan
- - clean purges the build, distribution, and site trees.
+ - clean purges the build, distribution, and site trees, the style docs
+ expanded from xml-site-style.tar.gz, and the top-level and
package-level
+ docs placed in the source tree for building Javadoc.
If you build a target that depends on other targets, those other targets are
created in
-the correct order. As a convenience for automated builds, docs and javadocs
do
+the correct order. As a convenience for automated builds, autodocs and
auotojavadocs do
not have dependencies on package.
Authors:
@@ -51,7 +53,7 @@
- Much of this file stolen from Stefano's xml-xerces build.xml
- $Id: build.xml,v 1.28 2000/08/23 13:11:33 curcuru Exp $
+ $Id: build.xml,v 1.29 2000/08/23 15:06:25 dleslie Exp $
==================================================================== -->
@@ -79,6 +81,8 @@
<property name="xdocs.dir" value="./xdocs"/>
<property name="xdocs.book" value="${xdocs.dir}/sources/xalanlocal.xml"/>
<property name="xdocs.style" value="${xdocs.dir}/style"/>
+ <property name="xalanonly-styledocs"
+
value="loaderjdoc.xml,dtd/javadocpackages.dtd,dtd/xsl-html40s.dtd,
stylesheets/designdoc2html.xsl,
stylesheets/design2project.xsl,stylesheets/notice.xsl,stylesheets/package2html.xsl,stylesheets/packages2project.xsl"/>
<property name="xdocs.javadocbook"
value="${xdocs.dir}/sources/javadocPackages.xml"/>
<property name="xdocs.javadocloader" value="sbk:/style/loaderjdoc.xml"/>
<property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
@@ -108,9 +112,6 @@
<mkdir dir="${build.dest}"/>
</target>
<target name="prepare.docs" depends="prepare">
- <!-- Note: unfortunately, our clean target currently does not clean up the
- stylebook-related files that come out of this tar. Fortunately, most
- users won't need to worry about this, and these files rarely change.
-->
<gunzip src="${doc.generator.styletargz}"/>
<untar src="${doc.generator.styletar}" dest="${xdocs.dir}"/>
<mkdir dir="${build.docs}"/>
@@ -170,14 +171,13 @@
debug="${debug}"/>
<javac srcdir="${samples.dir}/UseStylesheetParam"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
destdir="${build.samples}" excludes="${exclude}"
- debug="${debug}"/>
- <!-- The Servlet sample has already been updated to Xalan 2.x, so we
can't
- actually compile it here -->
- <!--
- javac srcdir="${samples.dir}/Servlet"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ debug="${debug}"/>
+ <jar jarfile="${build.samples}/${name}samples.jar"
basedir="${build.samples}"
+ includes="*.class"/>
+ <!-- Jar twice, so jar is built even if user doesn't have
classpath set up to compile the servlet -->
+ <javac srcdir="${samples.dir}/Servlet"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
destdir="${build.samples}" excludes="${exclude}"
- debug="${debug}"/
- -->
+ debug="${debug}"/>
<jar jarfile="${build.samples}/${name}samples.jar"
basedir="${build.samples}"
includes="*.class"/>
</target>
@@ -185,8 +185,12 @@
<!-- ===================================================================
-->
<!-- Generate HTML docs
-->
<!-- ===================================================================
-->
- <!-- explicitly remove depends=package to make automated JDK 1.1.8 builds
easier -->
- <target name="docs" depends="prepare.docs"> <!-- xalan.jar used by
doc.generator -->
+ <target name="docs" depends="prepare.docs,package,autodocs"> <!--
xalan.jar used by doc.generator -->
+ <echo message="docs is human-usable target with dependencies"/>
+ </target>
+
+ <target name="autodocs">
+ <echo message="autodocs is for automated build process, without
dependencies"/>
<java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
</target>
@@ -195,16 +199,13 @@
<!-- Creates the API documentation
-->
<!-- ===================================================================
-->
<!-- explicitly remove depends=package to make automated JDK 1.1.8 builds
easier -->
- <target name="javadocs" depends="prepare.docs"> <!-- xalan.jar used by
doc.generator -->
-
- <!-- Note: unfortunately this task will create the Javadoc package-level
files and
- put them in the local source tree, but clean doesn't currently
clean them up.
- This doesn't interfere with any other targets though, and shouldn't
leave
- too much extra stuff around. The main alternative would be to go
back to
- copying the entire source tree into the ./build dir, so that
javadoc can
- find both the sources and the package files there
- -->
- <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
+ <target name="javadocs" depends="prepare.docs,package,autojavadocs"> <!--
xalan.jar used by doc.generator -->
+ <echo message="javadocs is human-usable target with dependencies"/>
+ </target>
+
+ <target name="autojavadocs">
+ <echo message="autojavadocs is for automated build process, without
dependencies"/>
+ <java fork="yes" classname="${doc.generator}"
classpath="${java.class.path}:${build.dir}/${xalan.jar}"
args="loaderConfig=${xdocs.javadocloader}
targetDirectory=${src.dir} ${xdocs.javadocbook} ${xdocs.style}"/>
<javadoc
@@ -225,11 +226,21 @@
</target>
<!-- ===================================================================
-->
- <!-- Cleans everything
-->
+ <!-- Cleans everything: build tree, site tree, style docs in
-->
+ <!-- - build tree
-->
+ <!-- - distribution tree
-->
+ <!-- - site tree
-->
+ <!-- - style docs expanded from xml-site-style.tar.gz.
-->
+ <!-- (MUST update contents of ${xalanonly-styledocs}
-->
+ <!-- if change contents of xml-site-style.tar.gz)
-->
+ <!-- - Javadoc overview and packqage-level html docs placed
-->
+ <!-- in the source tree
-->
<!-- ===================================================================
-->
<target name="clean">
<deltree dir="${build.dir}"/>
<deltree dir="${site.root}"/>
+ <delete dir="${xdocs.style}" excludes="${xalanonly-styledocs}"/>
+ <delete dir="${src.dir}"
includes="javadocOverview.html,**/package.html"/>
</target>
<!-- ===================================================================
-->
