cziegeler 2003/12/19 00:57:31
Modified: tools/targets webapp-build.xml
Log:
If you exclude docs, the docs directory is now really not created
Revision Changes Path
1.5 +5 -5 cocoon-2.1/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- webapp-build.xml 18 Dec 2003 16:18:03 -0000 1.4
+++ webapp-build.xml 19 Dec 2003 08:57:31 -0000 1.5
@@ -93,7 +93,7 @@
includes="**/*.xwelcome"/>
</target>
- <target name="prepare-webapp-docs" depends="validate-xdocs"
unless="unless.exclude.webapp.documentation">
+ <target name="prepare-webapp-docs" depends="validate-xdocs,validate-jars"
unless="unless.exclude.webapp.documentation">
<mkdir dir="${build.webapp.docs}"/>
<copy todir="${build.webapp.docs}" filtering="on">
@@ -108,6 +108,10 @@
<!-- Add some other documents -->
<copy file="status.xml"
tofile="${build.webapp.docs}/xdocs/status.xml" filtering="on"/>
+ <!-- Copy the docs about all jar files (this requires a dependency to
validate-jars) -->
+ <copy file="${build.temp}/jars.xml"
+ tofile="${build.webapp.docs}/xdocs/installing/jars.xml"
+ filtering="off" failonerror="false" overwrite="true"/>
<!-- Forrest needs its own file at src/documentation/sitemap.xmap, so we
overwrite it with the old Cocoon-specific sitemap here -->
@@ -129,10 +133,6 @@
</target>
<target name="webapp"
depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf"
description="Builds web application folder">
- <!-- Add some other documents -->
- <copy file="${build.temp}/jars.xml"
- tofile="${build.webapp.docs}/xdocs/installing/jars.xml"
- filtering="off" failonerror="false"/>
</target>
<target name="war" depends="webapp" description="Builds web application
archive">
