svn commit: r123750 - /cocoon/trunk/tools/targets/docs-build.xml /cocoon/trunk/tools/targets/forrest-build.xml

[cr...@apache.org]

Author: crossley
Date: Thu Dec 30 15:40:07 2004
New Revision: 123750

URL: http://svn.apache.org/viewcvs?view=rev&rev=123750
Log:
Temporarily disconnect forrest from the build. Now do './build.sh docs; forrest'

Modified:
   cocoon/trunk/tools/targets/docs-build.xml
   cocoon/trunk/tools/targets/forrest-build.xml

Modified: cocoon/trunk/tools/targets/docs-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/docs-build.xml?view=diff&rev=123750&p1=cocoon/trunk/tools/targets/docs-build.xml&r1=123749&p2=cocoon/trunk/tools/targets/docs-build.xml&r2=123750
==============================================================================
--- cocoon/trunk/tools/targets/docs-build.xml	(original)
+++ cocoon/trunk/tools/targets/docs-build.xml	Thu Dec 30 15:40:07 2004
@@ -96,18 +96,29 @@
   </target>
 
   <!-- Create docs -->
-  <target name="docs"
+<!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and cocoon version number conflict 
       depends="validate-jars, prepare-docs, cocoon-validate-xdocs, docs_done, javadocs, do-forrest"
+-->
+  <target name="docs"
+      depends="validate-jars, prepare-docs, cocoon-validate-xdocs, docs_done, javadocs"
       unless="docs.notrequired" description="Builds the documentation">
     <!-- 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 -->

Modified: cocoon/trunk/tools/targets/forrest-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/forrest-build.xml?view=diff&rev=123750&p1=cocoon/trunk/tools/targets/forrest-build.xml&r1=123749&p2=cocoon/trunk/tools/targets/forrest-build.xml&r2=123750
==============================================================================
--- cocoon/trunk/tools/targets/forrest-build.xml	(original)
+++ cocoon/trunk/tools/targets/forrest-build.xml	Thu Dec 30 15:40:07 2004
@@ -31,7 +31,9 @@
   <property environment="env"/>
   <property name="forrest.home" value="${env.FORREST_HOME}"/>
   <!-- forrest_06_branch -->
+<!-- FIXME: Temporarily disbale forrest until we sort out the 0.6 vs 0.5 conflict 
   <import file="${env.FORREST_HOME}/forrest.build.xml" optional="true"/>
+-->
 
   <target name="do-forrest" depends="prepare-extra-docs, prepare, prepare-docs, validate-jars, javadocs" unless="exclude.documentation" description="Generates static HTML documentation">
     <antcall target="site"/>