Return-Path: 
 <cocoon-cvs-return-4144-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 43879 invoked by uid 500); 24 Nov 2001 22:03:57 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Delivered-To: moderator for cocoon-cvs@xml.apache.org
Received: (qmail 76499 invoked by uid 500); 24 Nov 2001 17:02:41 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 24 Nov 2001 16:46:44 -0000
Message-ID: <20011124164644.10086.qmail@icarus.apache.org>
From: rubys@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2 build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

rubys       01/11/24 08:46:44

  Modified:    .        build.xml
  Log:
  Allow optional jars to be found off of the classpath
  
  Add target dependencies so that the -warns are correctly executed no matter
  what target is specified.
  
  Revision  Changes    Path
  1.107     +12 -10    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- build.xml	2001/11/23 20:28:43	1.106
  +++ build.xml	2001/11/24 16:46:44	1.107
  @@ -132,6 +132,7 @@
       <fileset dir="./lib">
         <include name="*.jar"/>
       </fileset>
  +    <pathelement path="${java.class.path}" />
     </path>
   
     <path id="scratchpad.classpath">
  @@ -140,6 +141,7 @@
       </fileset>
       <!-- FIXME : how to build a path that references a property set in 'init' target ? -->
       <pathelement path="./build/cocoon/classes"/>
  +    <pathelement path="${java.class.path}" />
     </path>
   
     <!-- =================================================================== -->
  @@ -237,7 +239,7 @@
     <!-- =================================================================== -->
     <!-- Test for optional components                                        -->
     <!-- =================================================================== -->
  -  <target name="optional-tests" 
  +  <target name="optional-tests" depends="init"
             description="Tests for optional classes missing to the environment">
     
       <available property="jaxen.present" classname="org.jaxen.dom.XPath">
  @@ -362,7 +364,7 @@
     <!-- =================================================================== -->
     <!-- Warnings                                                            -->
     <!-- =================================================================== -->
  -  <target name="jfor-warn" unless="jfor.present" 
  +  <target name="jfor-warn" unless="jfor.present" depends="optional-tests"
         description="Outputs a warning if org.jfor.jfor.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="JFOR"/>
  @@ -372,7 +374,7 @@
                value="JFOR is required for the fo2rtf serializer."/>
       </antcall>
     </target>  
  -  <target name="xmldb-warn" unless="xmldb.present" 
  +  <target name="xmldb-warn" unless="xmldb.present" depends="optional-tests"
         description="Outputs a warning if org.xmldb.api.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="XMLDB"/>
  @@ -382,7 +384,7 @@
                value="XMLDB is required for the xmldb and xmldbcollection generator."/>
       </antcall>
     </target>  
  -  <target name="xt-warn" unless="xt.present" 
  +  <target name="xt-warn" unless="xt.present" depends="optional-tests"
         description="Outputs a warning if com.jclark.xsl.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="XT"/>
  @@ -392,7 +394,7 @@
                value="XT is required for the xt transformer."/>
       </antcall>
     </target>  
  -  <target name="php-warn" unless="php.present" 
  +  <target name="php-warn" unless="php.present" depends="optional-tests"
         description="Outputs a warning if net.php.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="Php"/>
  @@ -402,7 +404,7 @@
                value="Php is required for the php generator."/>
       </antcall>
     </target>  
  -  <target name="naming-warn" unless="naming.present" 
  +  <target name="naming-warn" unless="naming.present" depends="optional-tests"
         description="Outputs a warning if javax.naming.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="JDNI"/>
  @@ -412,7 +414,7 @@
                value="JNDI is required for the ldap generator and the parentcm generator."/>
       </antcall>
     </target>  
  -  <target name="svg-warn" unless="svg.present" 
  +  <target name="svg-warn" unless="svg.present" depends="optional-tests"
         description="Outputs a warning if org.apache.batik.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="Batik"/>
  @@ -422,7 +424,7 @@
                value="Batik is required for the svg serializers."/>
       </antcall>
     </target>  
  -  <target name="fop-warn" unless="fop.present" 
  +  <target name="fop-warn" unless="fop.present" depends="optional-tests"
         description="Outputs a warning if org.apache.fop.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="FOP"/>
  @@ -432,7 +434,7 @@
                value="FOP is required for the fo2pdf, fo2ps and fo2pcl serializer."/>
       </antcall>
     </target>  
  -  <target name="tidy-warn" unless="tidy.present" 
  +  <target name="tidy-warn" unless="tidy.present" depends="optional-tests"
         description="Outputs a warning if org.w3c.tidy.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="JTidy"/>
  @@ -442,7 +444,7 @@
                value="JTidy is required for the html generator."/>
       </antcall>
     </target>  
  -  <target name="maybeupload-warn" unless="maybeupload.present" 
  +  <target name="maybeupload-warn" unless="maybeupload.present" depends="optional-tests"
         description="Outputs a warning if uk.co.weft.maybeupload.* classes are missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="MaybeUpload"/>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org