You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2005/01/09 11:46:08 UTC
svn commit: r124724 - /cocoon/branches/BRANCH_2_1_X/build.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml
Author: crossley
Date: Sun Jan 9 02:46:08 2005
New Revision: 124724
URL: http://svn.apache.org/viewcvs?view=rev&rev=124724
Log:
Unbundle forrest from the cocoon build system.
Now do './build.sh docs; forrest'
Modified:
cocoon/branches/BRANCH_2_1_X/build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/build.xml?view=diff&rev=124724&p1=cocoon/branches/BRANCH_2_1_X/build.xml&r1=124723&p2=cocoon/branches/BRANCH_2_1_X/build.xml&r2=124724
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/build.xml Sun Jan 9 02:46:08 2005
@@ -20,7 +20,7 @@
| Apache Cocoon Build System |
* =========================== *
- CVS $Id: build.xml,v 1.36 2004/03/09 10:19:38 reinhard Exp $:
+ CVS $Id$:
============================================================================ -->
@@ -76,7 +76,9 @@
<!-- =================================================================== -->
<!-- Forrest targets -->
+<!--
<import file="tools/targets/forrest-build.xml" />
+-->
<!-- =================================================================== -->
</project>
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml?view=diff&rev=124724&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml&r1=124723&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml&r2=124724
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml Sun Jan 9 02:46:08 2005
@@ -22,12 +22,14 @@
</description>
<!-- Creates the web site -->
+<!--
<target name="site" depends="forrest" description="[admin] Builds the site">
<mkdir dir="${site}"/>
<copy todir="${site}" filtering="off">
<fileset dir="${build.site}"/>
</copy>
</target>
+-->
<!-- Create the announcements -->
<target name="announcement" depends="prepare-docs">
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml?view=diff&rev=124724&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml&r1=124723&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml&r2=124724
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml Sun Jan 9 02:46:08 2005
@@ -52,9 +52,9 @@
<!-- generate sitemap components docs using SitemapTask -->
<sitemap-components docDir="${build.context}/xdocs/userdocs" source="${java}"/>
- <!--
<echo message="Building component docs from blocks."/>
<sitemap-components docDir="${build.context}/xdocs/userdocs" source="${blocks}"/>
+ <!--
-->
<!-- Forrest needs its own file at src/documentation/sitemap.xmap, so we
@@ -100,18 +100,34 @@
</target>
<!-- Create docs -->
+<!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and cocoon version number conflict
+ depends="validate-jars, prepare-docs, validate-xdocs, docs_done, javadocs, do-forrest"
+-->
<target name="docs"
- depends="validate-jars, prepare-docs, validate-xdocs, docs_done, javadocs, forrest"
+ depends="validate-jars, prepare-docs, validate-xdocs, docs_done, javadocs"
unless="docs.notrequired" description="Builds the documentation">
+ <!-- Add some other documents -->
+ <copy file="${build.temp}/jars.xml"
+ tofile="${build.context}/xdocs/installing/jars.xml" filtering="off"
+ overwrite="yes"/>
+
<!-- The docs are created using forrest, so we simply copy them for now -->
<mkdir dir="${build.docs}"/>
+<echo message="
+FIXME: Not copying the forrest-built docs to ${build.docs}
+because you now need to run forrest manually and copy them yourself."/>
+<!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and cocoon version number conflict
<copy todir="${build.docs}" filtering="off">
<fileset dir="${build.site}"/>
</copy>
+-->
<copy todir="${build.docs}/apidocs" filtering="off">
<fileset dir="${build.javadocs}"/>
</copy>
+<echo message="
+NOTE: Now that the docs are prepared, run 'forrest' from the command-line.
+It will generate docs into ${build.site}"/>
</target>
<!-- Prepares the printer-docs -->