Return-Path: 
 <cvs-return-21502-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 91171 invoked from network); 29 Dec 2004 02:51:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 29 Dec 2004 02:51:00 -0000
Received: (qmail 62817 invoked by uid 500); 29 Dec 2004 02:50:59 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 62662 invoked by uid 500); 29 Dec 2004 02:50:58 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 62649 invoked by uid 99); 29 Dec 2004 02:50:58 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 28 Dec 2004 18:50:57 -0800
Received: (qmail 91077 invoked by uid 65534); 29 Dec 2004 02:50:55 -0000
Date: 29 Dec 2004 02:50:55 -0000
Message-ID: <20041229025055.91073.qmail@minotaur.apache.org>
From: crossley@apache.org
To: cvs@cocoon.apache.org
Subject: svn commit: r123588 - /cocoon/trunk/tools/targets/forrest-build.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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 -->