cziegeler    01/11/26 00:27:40

  Modified:    .        build.xml
  Log:
  Renamed target dists to dist
  
  Revision  Changes    Path
  1.108     +14 -32    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- build.xml 2001/11/24 16:46:44     1.107
  +++ build.xml 2001/11/26 08:27:40     1.108
  @@ -132,7 +132,6 @@
       <fileset dir="./lib">
         <include name="*.jar"/>
       </fileset>
  -    <pathelement path="${java.class.path}" />
     </path>
   
     <path id="scratchpad.classpath">
  @@ -141,7 +140,6 @@
       </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>
   
     <!-- =================================================================== -->
  @@ -239,7 +237,7 @@
     <!-- =================================================================== -->
     <!-- Test for optional components                                        -->
     <!-- =================================================================== -->
  -  <target name="optional-tests" depends="init"
  +  <target name="optional-tests" 
             description="Tests for optional classes missing to the environment">
     
       <available property="jaxen.present" classname="org.jaxen.dom.XPath">
  @@ -297,10 +295,6 @@
             <classpath refid="classpath"/>
       </available>
   
  -    <available property="jdbc3.present" classname="java.sql.Savepoint">
  -      <classpath refid="classpath"/>
  -    </available>
  -
       <ClassAvailable classpathref="classpath" 
                       property="php.present" 
                       classname="net.php.servlet"/>
  @@ -331,18 +325,6 @@
   
     </target>
     
  -  <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
  -
  -  <target name="filter-jdbc" unless="jdbc3.present">
  -    <filter token="JDBC3_START" value="/*"/>
  -    <filter token="JDBC3_END" value="*/"/>
  -  </target>
  -
  -  <target name="nofilter-jdbc" if="jdbc3.present">
  -    <filter token="JDBC3_START" value=""/>
  -    <filter token="JDBC3_END" value=""/>
  -  </target>
  -
     <!-- =================================================================== -->
     <!-- Macro for optional warnings                                         -->
     <!-- =================================================================== -->
  @@ -364,7 +346,7 @@
     <!-- =================================================================== -->
     <!-- Warnings                                                            -->
     <!-- =================================================================== -->
  -  <target name="jfor-warn" unless="jfor.present" depends="optional-tests"
  +  <target name="jfor-warn" unless="jfor.present" 
         description="Outputs a warning if org.jfor.jfor.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="JFOR"/>
  @@ -374,7 +356,7 @@
                value="JFOR is required for the fo2rtf serializer."/>
       </antcall>
     </target>  
  -  <target name="xmldb-warn" unless="xmldb.present" depends="optional-tests"
  +  <target name="xmldb-warn" unless="xmldb.present" 
         description="Outputs a warning if org.xmldb.api.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="XMLDB"/>
  @@ -384,7 +366,7 @@
                value="XMLDB is required for the xmldb and xmldbcollection 
generator."/>
       </antcall>
     </target>  
  -  <target name="xt-warn" unless="xt.present" depends="optional-tests"
  +  <target name="xt-warn" unless="xt.present" 
         description="Outputs a warning if com.jclark.xsl.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="XT"/>
  @@ -394,7 +376,7 @@
                value="XT is required for the xt transformer."/>
       </antcall>
     </target>  
  -  <target name="php-warn" unless="php.present" depends="optional-tests"
  +  <target name="php-warn" unless="php.present" 
         description="Outputs a warning if net.php.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="Php"/>
  @@ -404,7 +386,7 @@
                value="Php is required for the php generator."/>
       </antcall>
     </target>  
  -  <target name="naming-warn" unless="naming.present" depends="optional-tests"
  +  <target name="naming-warn" unless="naming.present" 
         description="Outputs a warning if javax.naming.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="JDNI"/>
  @@ -414,7 +396,7 @@
                value="JNDI is required for the ldap generator and the parentcm 
generator."/>
       </antcall>
     </target>  
  -  <target name="svg-warn" unless="svg.present" depends="optional-tests"
  +  <target name="svg-warn" unless="svg.present" 
         description="Outputs a warning if org.apache.batik.* classes are missing 
during compilation">
       <antcall target="op-warning">
         <param name="thing" value="Batik"/>
  @@ -424,7 +406,7 @@
                value="Batik is required for the svg serializers."/>
       </antcall>
     </target>  
  -  <target name="fop-warn" unless="fop.present" depends="optional-tests"
  +  <target name="fop-warn" unless="fop.present" 
         description="Outputs a warning if org.apache.fop.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="FOP"/>
  @@ -434,7 +416,7 @@
                value="FOP is required for the fo2pdf, fo2ps and fo2pcl serializer."/>
       </antcall>
     </target>  
  -  <target name="tidy-warn" unless="tidy.present" depends="optional-tests"
  +  <target name="tidy-warn" unless="tidy.present" 
         description="Outputs a warning if org.w3c.tidy.* classes are missing during 
compilation">
       <antcall target="op-warning">
         <param name="thing" value="JTidy"/>
  @@ -444,7 +426,7 @@
                value="JTidy is required for the html generator."/>
       </antcall>
     </target>  
  -  <target name="maybeupload-warn" unless="maybeupload.present" 
depends="optional-tests"
  +  <target name="maybeupload-warn" unless="maybeupload.present" 
         description="Outputs a warning if uk.co.weft.maybeupload.* classes are 
missing during compilation">
       <antcall target="op-warning">
         <param name="thing" value="MaybeUpload"/>
  @@ -474,7 +456,7 @@
     <!-- =================================================================== -->
     <!-- Prepares the source code                                            -->
     <!-- =================================================================== -->
  -  <target name="prepare-src-main" depends="prepare,generate-java-code,prepare-jdbc">
  +  <target name="prepare-src-main" depends="prepare,generate-java-code">
       <mkdir dir="${build.src}"/>
       <mkdir dir="${build.dest}"/>
       <copy todir="${build.src}" filtering="on">
  @@ -1302,7 +1284,7 @@
     <!-- =================================================================== -->
     <!-- Build all distributions                                             -->
     <!-- =================================================================== -->
  -  <target name="dists-info" depends="init">
  +  <target name="dist-info" depends="init">
       <echo>**********************************************</echo>
       <echo>*</echo>
       <echo>*  Build all distributions:</echo> 
  @@ -1318,8 +1300,8 @@
     <!-- =================================================================== -->
     <!-- Build all distributions                                             -->
     <!-- =================================================================== -->
  -  <target name="dists"
  -          depends="dists-info, dist-bin-tgz, dist-bin-zip, dist-src-tgz, 
dist-src-zip"
  +  <target name="dist"
  +          depends="dist-info, dist-bin-tgz, dist-bin-zip, dist-src-tgz, 
dist-src-zip"
             description="* Generates all distributions (source/binary)">
     </target>
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to