You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/12/19 10:03:34 UTC
cvs commit: cocoon-2.2/tools/targets webapp-build.xml
cziegeler 2003/12/19 01:03:34
Modified: tools/targets webapp-build.xml
Log:
If you exclude docs, the docs directory is now really not created
Revision Changes Path
1.2 +6 -7 cocoon-2.2/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/webapp-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webapp-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ webapp-build.xml 19 Dec 2003 09:03:33 -0000 1.2
@@ -109,7 +109,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">
@@ -124,6 +124,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 -->
@@ -144,12 +148,7 @@
includes="**/*.xwelcome"/>
</target>
- <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-javadocs,prepare-webapp-idldocs,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf" description="Builds web application folder">
- <!-- removed dependency on prepare-webapp-docs for 2.2 -->
- <!-- Add some other documents -->
- <copy file="${build.temp}/jars.xml"
- tofile="${build.webapp.docs}/xdocs/installing/jars.xml"
- filtering="off" failonerror="false"/>
+ <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">
</target>
<target name="war" depends="webapp" description="Builds web application archive">