dlr 02/01/25 23:35:04
Modified: . build.xml
Added: . default.properties
Log:
Now builds *all* sub-projects and consolidates
the resulting HTML in docs/ sub-dir.
Revision Changes Path
1.9 +37 -35 jakarta-turbine-site/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-site/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- build.xml 26 Jan 2002 03:04:02 -0000 1.8
+++ build.xml 26 Jan 2002 07:35:04 -0000 1.9
@@ -4,14 +4,12 @@
<project name="Turbine-site" default="docs" basedir=".">
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time they invoke a target) -->
-
- <!-- Set default values for the build -->
- <property file="build.properties" />
-
<!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
+ <property file="build.properties" />
+
+ <!-- Set default values for the build -->
+ <property file="default.properties" />
<!-- ================================================================== -->
<!-- Make Turbine documentation -->
@@ -41,9 +39,11 @@
<target name="docs"
depends="docs-prepare-error"
- description="--> generates the HTML documentation"
+ description="Generates the HTML documentation"
if="jdom.present">
-
+
+ <!-- Define a task for and run Anakia -->
+
<taskdef name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
<classpath>
@@ -54,18 +54,18 @@
</taskdef>
<anakia
- basedir="${docs.src}"
- destdir="${docs.dest}/"
+ basedir="${site.xdocs}"
+ destdir="${site.docs}/"
extension=".html" style="./site.vsl"
projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/** empty.xml"
+ excludes="**/stylesheets/** empty.xml ${xdocs.dest.turbine2}/**"
includes="**/*.xml"
lastModifiedCheck="true"
templatePath="${jakarta.site2}/xdocs/stylesheets">
</anakia>
- <copy todir="${docs.dest}/images" filtering="no">
- <fileset dir="${docs.src}/images">
+ <copy todir="${site.docs}/images" filtering="no">
+ <fileset dir="${site.xdocs}/images">
<include name="**/*.gif"/>
<include name="**/*.jpeg"/>
<include name="**/*.jpg"/>
@@ -73,36 +73,40 @@
</copy>
<!-- In case we have CSS someday
- <copy todir="${docs.dest}" filtering="no">
- <fileset dir="${docs.src}">
+ <copy todir="${site.docs}" filtering="no">
+ <fileset dir="${site.xdocs}">
<include name="**/*.css"/>
</fileset>
</copy>
- -->
+ -->
+
+ <!-- Run documentation builds for sub-projects, consolidating
+ documentation from disparate locations under docs tree -->
- <mkdir dir="${turbine2.doc}"/>
- <copy todir="${docs.dest}/turbine-2" overwrite="yes">
- <fileset dir="${turbine2.doc}"/>
+ <ant antfile="${turbine2.home}/build/build.xml" target="docs"
+ inheritall="false"/>
+ <copy todir="${site.docs}/turbine-2" overwrite="yes">
+ <fileset dir="${turbine2.docs}/"/>
</copy>
- <mkdir dir="${turbine3.doc}"/>
- <copy todir="${docs.dest}/turbine-3" overwrite="yes">
- <fileset dir="${turbine3.doc}"/>
+ <ant antfile="${turbine3.home}/build.xml" target="docs" inheritall="false"/>
+ <copy todir="${site.docs}/turbine-3" overwrite="yes">
+ <fileset dir="${turbine3.docs}"/>
</copy>
- <mkdir dir="${tdk.doc}"/>
- <copy todir="${docs.dest}/tdk" overwrite="yes">
- <fileset dir="${tdk.doc}"/>
+ <ant antfile="${torque.home}/build.xml" target="docs" inheritall="false"/>
+ <copy todir="${site.docs}/torque" overwrite="yes">
+ <fileset dir="${torque.docs}"/>
</copy>
- <mkdir dir="${torque.doc}"/>
- <copy todir="${docs.dest}/torque" overwrite="yes">
- <fileset dir="${torque.doc}"/>
+ <ant antfile="${fulcrum.home}/build.xml" target="docs" inheritall="false"/>
+ <copy todir="${site.docs}/fulcrum" overwrite="yes">
+ <fileset dir="${fulcrum.docs}"/>
</copy>
- <mkdir dir="${fulcrum.doc}"/>
- <copy todir="${docs.dest}/fulcrum" overwrite="yes">
- <fileset dir="${fulcrum.doc}"/>
+ <ant antfile="${tdk.home}/build.xml" target="docs" inheritall="false"/>
+ <copy todir="${site.docs}/tdk" overwrite="yes">
+ <fileset dir="${tdk.docs}"/>
</copy>
</target>
@@ -110,11 +114,9 @@
<!-- =================================================================== -->
<!-- C L E A N -->
<!-- =================================================================== -->
- <!-- Cleans up generated files -->
- <!-- =================================================================== -->
- <target name="clean">
- <delete dir="${docs.dest}"/>
+ <target name="clean" description="Removes generated and copied files">
+ <delete dir="${site.docs}"/>
</target>
</project>
1.1 jakarta-turbine-site/default.properties
Index: default.properties
===================================================================
# -------------------------------------------------------------------
# B U I L D P R O P E R T I E S
# -------------------------------------------------------------------
# These properties are used by the Turbine build, you may override
# any of these default values by placing property values in
# your ${user.home}/build.properties file.
# -------------------------------------------------------------------
jakarta.site2 = ../jakarta-site2
xdocs.src = xdocs
site.xdocs = xdocs
site.docs = docs
turbine2.home = ../jakarta-turbine-2
turbine2.xdocs = ${turbine2.home}/xdocs
turbine2.docs = ${turbine2.home}/docs
turbine3.home = ../jakarta-turbine-3
turbine3.xdocs = ${turbine3.home}/xdocs
turbine3.docs = ${turbine3.home}/docs
torque.home = ../jakarta-turbine-torque
torque.xdocs = ${torque.home}/xdocs
torque.docs = ${torque.home}/docs
fulcrum.home = ../jakarta-turbine-fulcrum
fulcrum.xdocs = ${fulcrum.home}/xdocs
fulcrum.docs = ${fulcrum.home}/docs
tdk.home = ../jakarta-turbine-tdk
tdk.xdocs = ${tdk.home}/xdocs
tdk.docs = ${tdk.home}/docs
jdom.jar = jdom-b7.jar
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
