vmassol 01/04/28 07:13:49
Modified: cactus/build build-servletapi.xml build.xml
Log:
added usage of new CVS logs custom Ant task in the target to generate web site and
documentation site
Revision Changes Path
1.5 +33 -5 jakarta-commons/cactus/build/build-servletapi.xml
Index: build-servletapi.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build-servletapi.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-servletapi.xml 2001/04/20 00:41:14 1.4
+++ build-servletapi.xml 2001/04/28 14:13:49 1.5
@@ -66,6 +66,7 @@
<property name="out.doc.dir" value="${out.dist.dir}/doc"/>
<property name="out.javadoc.dir" value="${out.doc.dir}/javadoc"/>
<property name="out.conf.dir" value="${out.dir}/conf"/>
+ <property name="out.xdoc.doc.dir" value="${out.dir}/xdocs"/>
<!-- Destination locations for the Cactus sample application
(also used as functional tests for Cactus) -->
@@ -370,17 +371,44 @@
<!-- Preparation target for the doc target -->
<target name="prepare-doc" depends="javadoc">
+ <mkdir dir="${out.xdoc.doc.dir}"/>
<mkdir dir="${out.doc.dir}"/>
<mkdir dir="${out.doc.dir}/images"/>
+ <!-- Custom Ant task definitions -->
+ <taskdef name="cvslog"
classname="org.apache.commons.cactus.ant.ChangeLogNewsTask">
+ <classpath>
+ <pathelement location="${final.jar.ant.name}"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </taskdef>
+
+ <!-- Generate cvs log -->
+ <delete file="${xdoc.dir}/cvslog/cvslog.xml"/>
+ <cvslog users="${xdoc.dir}/cvslog/users.properties" work="${xdoc.dir}"
+ output="${xdoc.dir}/cvslog/cvslog.xml" elapsed="15">
+
+ <fileset dir="${xdoc.dir}"
excludes="book.xml,cvslog.xml,doc-book.xml,site-book.xml">
+ <include name="**/*.xml"/>
+ </fileset>
+
+ </cvslog>
+
<!-- Copy doc-book.xml to book.xml for defining the documentation web
- site and replacing token filters (year) -->
- <delete file="${xdoc.dir}/book.xml"/>
- <copy file="${xdoc.dir}/doc-book.xml" tofile="${xdoc.dir}/book.xml"
+ site and replacing token filters (year, ...) -->
+ <copy file="${xdoc.dir}/doc-book.xml" tofile="${out.xdoc.doc.dir}/book.xml"
filtering="on"/>
+ <!-- Copy all remaining files from ${xdoc.dir} to ${out.xdoc.doc.dir} -->
+ <copy todir="${out.xdoc.doc.dir}" filtering="on">
+ <fileset dir="${xdoc.dir}">
+ <exclude name="*-book.xml"/>
+ <exclude name="misc/**"/>
+ </fileset>
+ </copy>
+
<!-- Copy the images -->
- <copy todir="${out.site.dir}/images">
+ <copy todir="${out.doc.dir}/images">
<fileset dir="${xdoc.dir}/images"/>
</copy>
@@ -390,7 +418,7 @@
<target name="doc" depends="prepare-doc">
<!-- Generate the documentation web site -->
- <stylebook book="${xdoc.dir}/book.xml"
+ <stylebook book="${out.xdoc.doc.dir}/book.xml"
skinDirectory="${skin.dir}/jakarta.apache.org"
targetDirectory="${out.doc.dir}">
1.5 +33 -6 jakarta-commons/cactus/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/04/22 16:11:18 1.4
+++ build.xml 2001/04/28 14:13:49 1.5
@@ -118,6 +118,7 @@
<property name="out.classes.ant.dir" value="${out.root.dir}/classes"/>
<property name="out.src.ant.dir" value="${out.root.dir}/src"/>
<property name="out.conf.ant.dir" value="${out.root.dir}/conf"/>
+ <property name="out.xdoc.site.dir" value="${out.root.dir}/xdocs"/>
<!--
========================================================================
@@ -360,17 +361,44 @@
Generate the web site
========================================================================
-->
- <target name="prepare-site" depends="init">
+ <target name="prepare-site" depends="jar">
+ <mkdir dir="${out.xdoc.site.dir}"/>
<mkdir dir="${out.site.dir}"/>
<mkdir dir="${out.site.dir}/images"/>
+ <!-- Custom Ant task definitions -->
+ <taskdef name="cvslog"
classname="org.apache.commons.cactus.ant.ChangeLogNewsTask">
+ <classpath>
+ <pathelement location="${final.jar.ant.name}"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </taskdef>
+
+ <!-- Generate cvs log -->
+ <delete file="${xdoc.dir}/cvslog/cvslog.xml"/>
+ <cvslog users="${xdoc.dir}/cvslog/users.properties" work="${xdoc.dir}"
+ output="${xdoc.dir}/cvslog/cvslog.xml" elapsed="15">
+
+ <fileset dir="${xdoc.dir}"
excludes="book.xml,cvslog.xml,doc-book.xml,site-book.xml">
+ <include name="**/*.xml"/>
+ </fileset>
+
+ </cvslog>
+
<!-- Copy site-book.xml to book.xml for defining the web site content
and replacing token filters (year) -->
- <delete file="${xdoc.dir}/book.xml"/>
- <copy file="${xdoc.dir}/site-book.xml" tofile="${xdoc.dir}/book.xml"
+ <copy file="${xdoc.dir}/site-book.xml"
tofile="${out.xdoc.site.dir}/book.xml"
filtering="on"/>
+ <!-- Copy all remaining files from ${xdoc.dir} to ${out.xdoc.site.dir} -->
+ <copy todir="${out.xdoc.site.dir}" filtering="on">
+ <fileset dir="${xdoc.dir}">
+ <exclude name="*-book.xml"/>
+ <exclude name="misc/**"/>
+ </fileset>
+ </copy>
+
<!-- Copy the version.txt file -->
<copy file="${conf.dir}/version.txt"
tofile="${out.site.dir}/version.txt" filtering="on"/>
@@ -391,7 +419,7 @@
<!-- Generate the web site -->
<target name="site" depends="prepare-site">
- <stylebook book="${xdoc.dir}/book.xml"
+ <stylebook book="${out.xdoc.site.dir}/book.xml"
skinDirectory="${skin.dir}/jakarta.apache.org"
targetDirectory="${out.site.dir}">
@@ -445,7 +473,7 @@
<delete>
<fileset dir=".">
<include name="**/*.bak"/>
- <include name="${xdoc.dir}/book.xml"/>
+ <include name="${xdoc.dir}/cvslog/cvslog.xml"/>
</fileset>
</delete>
@@ -461,7 +489,6 @@
<delete>
<fileset dir=".">
<include name="**/*.log"/>
- <include name="version.txt"/>
</fileset>
</delete>
