cvs commit: jakarta-taglibs/input build.xml

[gl...@apache.org]

glenn       01/01/06 10:46:50

  Modified:    input    build.xml
  Log:
  Replace deprecated ant tags
  
  Revision  Changes    Path
  1.4       +18 -17    jakarta-taglibs/input/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/input/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	2000/12/08 02:50:02	1.3
  +++ build.xml	2001/01/06 18:46:50	1.4
  @@ -24,6 +24,7 @@
       -->
   
       <property name="taglib.name"    value="input"/>
  +    <property name="servlet.jar"    value="../../jakarta-servletapi/lib/servlet.jar"/>
   
       <!-- ****************** Project Standard Properties ******************* -->
   
  @@ -125,20 +126,20 @@
           <include name="**/*.html"/>
         </fileset>
       </copy>
  -<!--
  -    <javac srcdir="${doc.src}/src"   destdir="${build.doc}/WEB-INF/classes"
  -           classpath="${servlet.jar}" debug="on"/>
  --->
     </target>
   
     <!-- Compile the examples application -->
     <target name="examples" depends="library-dist">
  -    <copydir src="${examples.src}/conf" dest="${build.examples}/WEB-INF"/>
  -    <copydir src="${examples.src}/web"  dest="${build.examples}"/>
  -    <copyfile src="${dist.tld}"
  -              dest="${build.examples}/WEB-INF/${taglib.name}.tld"/>
  -    <copyfile src="${dist.library}"
  -              dest="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
  +    <copy todir="${build.examples}/WEB-INF">
  +      <fileset dir="${examples.src}/conf"/>
  +    </copy>
  +    <copy todir="${build.examples}">
  +      <fileset dir="${examples.src}/web"/>
  +    </copy>
  +    <copy file="${dist.tld}"
  +              tofile="${build.examples}/WEB-INF/${taglib.name}.tld"/>
  +    <copy file="${dist.library}"
  +              tofile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
      <!--
       <javac srcdir="${examples.src}/src"
              destdir="${build.examples}/WEB-INF/classes"
  @@ -148,8 +149,8 @@
   
     <!-- Compile the tag library itself -->
     <target name="library" depends="prepare">
  -    <copyfile src="${conf.src}/taglib.tld"
  -              dest="${build.library}/META-INF/taglib.tld"/>
  +    <copy file="${conf.src}/taglib.tld"
  +              tofile="${build.library}/META-INF/taglib.tld"/>
       <javac srcdir="${library.src}" destdir="${build.library}"
              classpath="${servlet.jar}" debug="on"/>
     </target>
  @@ -173,7 +174,7 @@
     <!-- Create the library distribution files -->
     <target name="library-dist" depends="library">
       <jar jarfile="${dist.library}" basedir="${build.library}"/>
  -    <copyfile src="${conf.src}/taglib.tld" dest="${dist.tld}"/>
  +    <copy file="${conf.src}/taglib.tld" tofile="${dist.tld}"/>
     </target>
   
     <!-- Create the entire set of distribution files -->
  @@ -185,10 +186,10 @@
   
     <!-- Delete output directories and files so we can build from scratch -->
     <target name="clean">
  -    <deltree dir="${build.doc}"/>
  -    <deltree dir="${build.examples}"/>
  -    <deltree dir="${build.library}"/>
  -    <deltree dir="${dist.dir}/${taglib.name}"/>
  +    <delete dir="${build.doc}"/>
  +    <delete dir="${build.examples}"/>
  +    <delete dir="${build.library}"/>
  +    <delete dir="${dist.dir}/${taglib.name}"/>
     </target>
   
   </project>