cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r123588 - /cocoon/trunk/tools/targets/forrest-build.xml
Date Wed, 29 Dec 2004 02:50:55 GMT
Author: crossley
Date: Tue Dec 28 18:50:53 2004
New Revision: 123588

URL: http://svn.apache.org/viewcvs?view=rev&rev=123588
Log:
Enable main Cocoon build to proceed if Forrest is not available.
Add the "optional" parameter to the <import>.
Use <antcall>.

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

Modified: cocoon/trunk/tools/targets/forrest-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/forrest-build.xml?view=diff&rev=123588&p1=cocoon/trunk/tools/targets/forrest-build.xml&r1=123587&p2=cocoon/trunk/tools/targets/forrest-build.xml&r2=123588
==============================================================================
--- cocoon/trunk/tools/targets/forrest-build.xml	(original)
+++ cocoon/trunk/tools/targets/forrest-build.xml	Tue Dec 28 18:50:53 2004
@@ -30,14 +30,11 @@
 
   <property environment="env"/>
   <property name="forrest.home" value="${env.FORREST_HOME}"/>
-  <!-- forrest-0.6
-  -->
-  <import file="${env.FORREST_HOME}/forrest.build.xml"/>
-  <!-- forrest-0.7-dev
-  <import file="${env.FORREST_HOME}/main/forrest.build.xml"/>
-  -->
+  <!-- forrest_06_branch -->
+  <import file="${env.FORREST_HOME}/forrest.build.xml" optional="true"/>
 
-  <target name="do-forrest" depends="site, prepare-extra-docs, prepare, prepare-docs,
validate-jars, javadocs" unless="exclude.documentation" description="Generates static HTML
documentation">
+  <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"/>
   </target>
 
   <!-- Add some other specific documents -->

Mime
View raw message