cmlenz 2003/01/15 05:06:22
Modified: . build.xml gump.xml
documentation build.xml
Log:
Included the <checksitemap>-Task in the documentation build process, thus
reintroducing the dependancy of jakarta-cactus-documentation on
jakarta-cactus-ant.
Revision Changes Path
1.35 +1 -1 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 12 Jan 2003 17:12:39 -0000 1.34
+++ build.xml 15 Jan 2003 13:06:22 -0000 1.35
@@ -226,7 +226,7 @@
</target>
<!-- Run Documentation dist target -->
- <target name="run.documentation">
+ <target name="run.documentation" depends="run.anttasks">
<ant target="dist" antfile="documentation/build.xml"
inheritAll="false">
1.34 +4 -2 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gump.xml 10 Jan 2003 14:08:14 -0000 1.33
+++ gump.xml 15 Jan 2003 13:06:22 -0000 1.34
@@ -44,8 +44,10 @@
-->
<project name="jakarta-cactus-documentation">
- <ant buildfile="documentation/build.xml" target="dist"/>
-
+ <ant buildfile="documentation/build.xml" target="dist">
+ <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
+ </ant>
+
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="xml-xalan2"/>
1.27 +46 -27 jakarta-cactus/documentation/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 13 Jan 2003 10:41:52 -0000 1.26
+++ build.xml 15 Jan 2003 13:06:22 -0000 1.27
@@ -82,6 +82,10 @@
<property name="dist.doc.dir" value="${dist.dir}/doc"/>
<property name="dist.doc.api.dir" value="${dist.doc.dir}/api"/>
+ <!-- The location of the Cactus custom Ant tasks jar -->
+ <property name="cactus.ant.jar"
+ location="anttasks/dist/lib/cactus-ant.jar"/>
+
<!--
========================================================================
Display configurable properties values
@@ -145,33 +149,6 @@
<mkdir dir="${target.doc.dir}"/>
<mkdir dir="${target.doc.dir}/images"/>
- </target>
-
- <target name="doc.cvschangelog"
- depends="doc.prepare"
- unless="offline">
-
- <!-- Generate CVS log -->
- <mkdir dir="${target.xdoc.dir}/cvslog"/>
- <cvschangelog dir="${doc.xdoc.dir}"
- usersfile="${doc.xdoc.dir}/cvslog/users.properties"
- destfile="${target.xdoc.dir}/cvslog/cvslog.xml"
- daysinpast="15">
- <fileset dir="${doc.xdoc.dir}">
- <exclude name="**/navigation.xml"/>
- <exclude name="sitemap.xml"/>
- <exclude name="todo.xml"/>
- <exclude name="changes.xml"/>
- <exclude name="**/cvslog.xml"/>
- <include name="**/*.xml"/>
- </fileset>
- </cvschangelog>
-
- </target>
-
- <target name="doc"
- depends="doc.cvschangelog">
-
<!-- Copy all files that may contain token filters or that are not
binary files -->
<copy todir="${target.xdoc.dir}" filtering="on">
@@ -201,6 +178,48 @@
<!-- Copy the version.txt file -->
<copy file="${conf.dir}/version.txt" todir="${target.doc.dir}"
filtering="on"/>
+
+ </target>
+
+ <target name="doc.cvschangelog"
+ depends="doc.prepare"
+ unless="offline">
+
+ <!-- Generate CVS log -->
+ <mkdir dir="${target.xdoc.dir}/cvslog"/>
+ <cvschangelog dir="${doc.xdoc.dir}"
+ usersfile="${doc.xdoc.dir}/cvslog/users.properties"
+ destfile="${target.xdoc.dir}/cvslog/cvslog.xml"
+ daysinpast="15">
+ <fileset dir="${doc.xdoc.dir}">
+ <exclude name="**/navigation.xml"/>
+ <exclude name="sitemap.xml"/>
+ <exclude name="todo.xml"/>
+ <exclude name="changes.xml"/>
+ <exclude name="**/cvslog.xml"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </cvschangelog>
+
+ </target>
+
+ <target name="doc.checksitemap"
+ depends="doc.cvschangelog">
+
+ <taskdef name="checksitemap"
+ classname="org.apache.cactus.ant.CheckSitemapTask">
+ <classpath>
+ <pathelement location="${cactus.ant.jar}"/>
+ </classpath>
+ </taskdef>
+
+ <!-- Check the sitemap for invalid links -->
+ <checksitemap sitemap="${target.xdoc.dir}/sitemap.xml"/>
+
+ </target>
+
+ <target name="doc"
+ depends="doc.checksitemap">
<!-- Generate the docs -->
<style basedir="${target.xdoc.dir}" destdir="${target.doc.dir}"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
