dlr         02/01/14 17:23:08

  Modified:    .        build.xml
  Log:
  o Made build file robust enough to handle new dependencies introduced
  by Stratum.
  
  o Alphabetized in a few spots.
  
  Revision  Changes    Path
  1.15      +56 -11    jakarta-turbine-3/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -u -r1.14 -r1.15
  --- build.xml 15 Jan 2002 01:07:21 -0000      1.14
  +++ build.xml 15 Jan 2002 01:23:08 -0000      1.15
  @@ -22,17 +22,19 @@
   
     <!-- Build classpath -->
     <path id="classpath">
  -    <pathelement location="${velocity.jar}"/>
  -    <pathelement location="${log4j.jar}"/>
  -    <pathelement location="${servlet.jar}"/>
  +    <pathelement location="${commons-beanutils.jar}"/>
  +    <pathelement location="${commons-collections.jar}"/>
  +    <pathelement location="${commons-util.jar}"/>
  +    <pathelement location="${dom4j.jar}"/>
       <pathelement location="${fulcrum.jar}"/>
  +    <pathelement location="${jaf.jar}"/>
  +    <pathelement location="${log4j.jar}"/>
       <pathelement location="${regexp.jar}"/>
       <pathelement location="${torque.jar}"/>
  -    <pathelement location="${jaf.jar}"/>
  -    <pathelement location="${xerces.jar}"/>
  -    <pathelement location="${commons-collections.jar}"/>
  -    <pathelement location="${commons-util.jar}"/>
  +    <pathelement location="${servlet.jar}"/>
       <pathelement location="${stratum.jar}"/>
  +    <pathelement location="${velocity.jar}"/>
  +    <pathelement location="${xerces.jar}"/>
     </path>
   
     <!-- ================================================================== -->
  @@ -73,6 +75,18 @@
     
     <target name="check_available">
       
  +    <available
  +      classname="org.apache.commons.beanutils.PropertyUtils"
  +      property="commons-beanutils.present"
  +      classpathref="classpath"
  +    />
  +
  +    <available
  +      classname="org.dom4j.Node"
  +      property="dom4j.present"
  +      classpathref="classpath"
  +    />
  +
       <available 
         classname="org.apache.velocity.runtime.Runtime"
         property="velocity.present"
  @@ -133,6 +147,12 @@
         classpathref="classpath"
       />
   
  +    <available
  +      classname="org.apache.stratum.xo.Mapper"
  +      property="stratum.present"
  +      classpathref="classpath"
  +    />
  +
       <!-- Not required for building -->
       <available 
         property="jsdk2.2.present"
  @@ -148,6 +168,22 @@
   
     </target>
   
  +  <target name="check.commons-beanutils"
  +          unless="commons-beanutils.present">
  +    <echo>commons-beanutils.present = ${commons-beanutils.present}</echo>
  +    <antcall target="property-warning">
  +      <param name="name" value="commons-beanutils.jar"/>
  +      <param name="value" value="${commons-beanutils.jar}"/>
  +    </antcall>
  +  </target>
  +
  +  <target name="check.dom4j" unless="dom4j.present">
  +    <antcall target="property-warning">
  +      <param name="name" value="dom4j.jar"/>
  +      <param name="value" value="${dom4j.jar}"/>
  +    </antcall>
  +  </target>
  +
     <target name="check.velocity" unless="velocity.present">
       <antcall target="property-warning">
         <param name="name" value="velocity.jar"/>
  @@ -218,6 +254,13 @@
       </antcall>
     </target>
   
  +  <target name="check.stratum" unless="stratum.present">
  +    <antcall target="property-warning">
  +      <param name="name" value="stratum.jar"/>
  +      <param name="value" value="${stratum.jar}"/>
  +    </antcall>
  +  </target>
  +
     <target name="property-warning">
       <echo>
         +----------------------------------------------------------------+
  @@ -240,10 +283,12 @@
     <!-- Prepares the build directory                                       -->
     <!-- ================================================================== -->
     
  -  <target name="prepare" depends="env,check.velocity,check.log4j,check.servlet,
  -                                  check.fulcrum,check.regexp,check.torque,check.jaf,
  -                                  check.xerces,
  -                                  check.commons-collections,check.commons-util">
  +  <target name="prepare"
  +       depends="env,
  +                   check.commons-beanutils,check.commons-collections,
  +                   check.commons-util,check.dom4j,check.jaf,check.log4j,
  +                   check.fulcrum,check.regexp,check.servlet,check.stratum,
  +                   check.torque,check.xerces,check.velocity">
   
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.dest}"/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to