Return-Path: 
 <forrest-dev-return-2971-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 18404 invoked by uid 500); 31 Oct 2002 16:23:48 -0000
Mailing-List: contact forrest-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-dev-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-dev-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-dev@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-dev@xml.apache.org
Received: (qmail 18395 invoked by uid 500); 31 Oct 2002 16:23:47 -0000
Delivered-To: apmail-xml-forrest-cvs@apache.org
Received: (qmail 18392 invoked from network); 31 Oct 2002 16:23:47 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 31 Oct 2002 16:23:47 -0000
Received: (qmail 5952 invoked by uid 1352); 31 Oct 2002 16:23:47 -0000
Date: 31 Oct 2002 16:23:47 -0000
Message-ID: <20021031162347.5951.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
Status: O
X-Status: 
X-Keywords: 

jefft       2002/10/31 08:23:47

  Modified:    .        build.xml
  Log:
  - Get 'webapp', 'war', 'site' targets working when invoked from user's ant, not
    build.sh
  - Re-add 'validate' target
  
  Revision  Changes    Path
  1.31      +13 -16    xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml	30 Oct 2002 08:50:33 -0000	1.30
  +++ build.xml	31 Oct 2002 16:23:47 -0000	1.31
  @@ -259,10 +259,13 @@
          appropriate documentation. 
         (which is by the way generated by calling this very target) -->
       <property name="forrest.home" value="${dist-shbat.dir}" />
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
  +    <!--
       <ant antfile="${forrest.home}/forrest.build.xml" target="site">
         <property name="project.home"     value="."            />
         <property name="project.site-dir" value="./build/docs" />
       </ant>
  +    -->
     </target>
   
   
  @@ -270,19 +273,8 @@
     <!-- Generate cocoon-webapp for project-site                             -->
     <!-- =================================================================== -->
     <target name="webapp" depends="dist-shbat">
  -    <!-- warning to other projects:
  -       This target is using internally build productions for test.
  -       This is by no means an example of how you can use it inside your project 
  -      (although it will resemble it in many ways, to make the test meaningfull)
  -
  -       The correct way of using forrest for your project is to build one of the
  -       forrest distribution-flavours and readup on how you should do that in the 
  -       appropriate documentation. -->
       <property name="forrest.home" value="${dist-shbat.dir}" />
  -    <ant antfile="${forrest.home}/forrest.build.xml" target="webapp">
  -      <property name="project.home"     value="."            />
  -      <property name="project.webapp" value="./build/webapp" />
  -    </ant>
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="webapp"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -290,10 +282,15 @@
     <!-- =================================================================== -->
     <target name="war" depends="dist-shbat">
       <property name="forrest.home" value="${dist-shbat.dir}" />
  -    <ant antfile="${forrest.home}/forrest.build.xml" target="war">
  -      <property name="project.home"     value="."            />
  -      <property name="project.war" value="./build/${name}.war" />
  -    </ant>
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="war"/>
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Validates Forrest XML documentation                                 -->
  +  <!-- =================================================================== -->
  +  <target name="validate" depends="dist-shbat">
  +    <property name="forrest.home" value="${dist-shbat.dir}" />
  +    <ant antfile="${forrest.home}/forrest.antproxy.xml" target="validate"/>
     </target>
   
     <!-- =================================================================== -->