dlr         00/10/22 16:15:56

  Modified:    build/lib ant.jar
               build    build-velocity.xml
  Log:
  Ant CVS build from Oct. 20, 2000, and updated XML build file.
  
  Revision  Changes    Path
  1.2       +785 -696  jakarta-velocity/build/lib/ant.jar
  
        <<Binary file>>
  
  
  1.9       +22 -25    jakarta-velocity/build/build-velocity.xml
  
  Index: build-velocity.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/build/build-velocity.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build-velocity.xml        2000/10/22 22:46:03     1.8
  +++ build-velocity.xml        2000/10/22 23:15:55     1.9
  @@ -48,9 +48,11 @@
           <!-- JUnit Testbed -->
           <property name="velocity.test.runner" value="junit.textui.TestRunner"/>
           <!-- 
  -        <property name="velocity.test.runner" value="junit.swinggui.TestRunner"/>
  +        <property name="velocity.test.runner"
  +            value="junit.swinggui.TestRunner"/>
           -->
  -        <property name="velocity.test" 
value="org.apache.velocity.test.VelocityTest"/>
  +        <property name="velocity.test"
  +            value="org.apache.velocity.test.VelocityTest"/>
           
           <property name="default.properties" 
               value="org/apache/velocity/runtime/defaults/velocity.properties"/>
  @@ -71,9 +73,9 @@
           <mkdir dir="${build.dest}"/>
           <mkdir dir="${build.src}"/>
   
  -        <copydir src="${src.java.dir}" dest="${build.src}" 
  -            includes="**/*.java"
  -        />
  +        <copy todir="${build.src}">
  +            <fileset dir="${src.java.dir}" includes="**/*.java"/>
  +        </copy>
       </target>
   
       <!-- =================================================================== -->
  @@ -86,18 +88,14 @@
               debug="${debug}"
               deprecation="${deprecation}"
               optimize="${optimize}"/>
  -            
  -            <copydir 
  -                src="${src.java.dir}/org/apache/velocity"
  -                dest="${build.dest}/org/apache/velocity"
  -                includes="**/*.class"
  -            />                
               
  -            <copyfile
  -                src="${src.java.dir}/${default.properties}"
  -                dest="${build.dest}/${default.properties}"
  -            />                
  +            <copy todir="${build.dest}/org/apache/velocity">
  +                <fileset dir="${src.java.dir}/org/apache/velocity"
  +                    includes="**/*.class"/>
  +            </copy>
               
  +            <copy file="${src.java.dir}/${default.properties}"
  +                tofile="${build.dest}/${default.properties}"/>
       </target>
     
       <!-- =================================================================== -->
  @@ -138,31 +136,30 @@
       <target name="dist" depends="jar,javadocs">
           <mkdir dir="${dist.dir}"/>
           <mkdir dir="${dist.dir}/src/java"/>
  -        <copydir src="${build.dir}/src/" dest="${dist.dir}/src/java/"/>
  -        <copydir src="../docs" dest="${dist.dir}/docs" />
  -        <copydir src="../build" dest="${dist.dir}/build"/>
  +        <copy file="${build.dir}/src/" todir="${dist.dir}/src/java/"/>
  +        <copy file="../docs" todir="${dist.dir}/docs"/>
  +        <copy file="../build" todir="${dist.dir}/build"/>
           
  -        <copydir src="../examples" dest="${dist.dir}/examples"/>
  +        <copy file="../examples" todir="${dist.dir}/examples"/>
           <chmod file="${dist.dir}/examples/test.sh" perm="+x" />
           
  -        <copydir src="../testbed" dest="${dist.dir}/testbed"/>
  +        <copy file="../testbed" todir="${dist.dir}/testbed"/>
           <chmod file="${dist.dir}/testbed/test.sh" perm="+x" />
           
  -        <copyfile src="${build.dir}/${project}.jar" 
  -            dest="${dist.dir}/${project}.jar"/>
  +        <copy file="${build.dir}/${project}.jar" 
  +            tofile="${dist.dir}/${project}.jar"/>
           
           <jar jarfile="../${final.name}.jar" basedir="${dist.root}" 
               excludes="**/package.html"/>
       
  -        <deltree dir="${dist.root}"/>
  -
  +        <delete dir="${dist.root}"/>
       </target>
     
       <!-- =================================================================== -->
       <!-- Cleans up the build directory                                       -->
       <!-- =================================================================== -->
       <target name="clean" depends="init">
  -        <deltree dir="${build.dir}"/>
  +        <delete dir="${build.dir}"/>
       </target>
   
       <!-- =================================================================== -->
  
  
  

Reply via email to