You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by gl...@apache.org on 2001/01/06 19:54:03 UTC

cvs commit: jakarta-taglibs/regexp build.xml

glenn       01/01/06 10:54:03

  Modified:    regexp   build.xml
  Log:
  Replace deprecated ant tags
  
  Revision  Changes    Path
  1.4       +27 -36    jakarta-taglibs/regexp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/regexp/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	2000/12/08 02:50:03	1.3
  +++ build.xml	2001/01/06 18:54:03	1.4
  @@ -1,5 +1,5 @@
   <!-- ANT Build Script for the "regexp" Custom Tag Library -->
  -<!-- $Id: build.xml,v 1.3 2000/12/08 02:50:03 horwat Exp $ -->
  +<!-- $Id: build.xml,v 1.4 2001/01/06 18:54:03 glenn Exp $ -->
   <project name="regexp" default="main" basedir=".">
   
       <!-- ******************** Adjustable Properties *********************** -->
  @@ -143,44 +143,35 @@
                doctitle="Jakarta REGEXP custom tag library"
                bottom="Copyright &#169; 2000 Apache Software Foundation. All Rights Reserved."
       />
  -<!--
  -    <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="${lib.src}" dest="${build.examples}/WEB-INF/lib"/>
  -    <copydir src="${library.src}" dest="${build.examples}/WEB-INF/classes"/>
  --->
  -    <copydir src="${examples.src}/conf" dest="${build.examples}/WEB-INF"/>
  -    <copydir src="${examples.src}/web"  dest="${build.examples}"/>
  -    <copyfile src="${dist.dir}/request/request.jar"
  -	      dest="${build.examples}/WEB-INF/lib/request.jar"/>
  -    <copyfile src="${dist.dir}/request/request.tld"
  -              dest="${build.examples}/WEB-INF/request.tld"/>
  -    <copyfile src="${conf.src}/regexp.tld" dest="${dist.tld}"/>
  -    <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"/>
  -    <copyfile src="${examples.src}/web/regexp.jsp"
  -              dest="${build.examples}/regexp.txt"/>
  -    <copyfile src="${oro.jar}"
  -              dest="${build.examples}/WEB-INF/lib/jakarta-oro-2.0.jar"/>
  -<!--
  -    <javac srcdir="${examples.src}/src"
  -           destdir="${build.examples}/WEB-INF/classes"
  -           classpath="${servlet.jar}" debug="on"/>
  --->
  +    <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.dir}/request/request.jar"
  +	      tofile="${build.examples}/WEB-INF/lib/request.jar"/>
  +    <copy file="${dist.dir}/request/request.tld"
  +              tofile="${build.examples}/WEB-INF/request.tld"/>
  +    <copy file="${conf.src}/regexp.tld" tofile="${dist.tld}"/>
  +    <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"/>
  +    <copy file="${examples.src}/web/regexp.jsp"
  +              tofile="${build.examples}/regexp.txt"/>
  +    <copy file="${oro.jar}"
  +              tofile="${build.examples}/WEB-INF/lib/jakarta-oro-2.0.jar"/>
     </target>
   
     <!-- Compile the tag library itself -->
     <target name="library" depends="prepare">
  -    <copyfile src="${conf.src}/regexp.tld"
  -              dest="${build.library}/META-INF/taglib.tld"/>
  +    <copy file="${conf.src}/regexp.tld"
  +              tofile="${build.library}/META-INF/taglib.tld"/>
       <javac srcdir="${library.src}" destdir="${build.library}"
              classpath="${servlet.jar}:${oro.jar}" debug="on"/>
     </target>
  @@ -204,7 +195,7 @@
     <!-- Create the library distribution files -->
     <target name="library-dist" depends="library">
       <jar jarfile="${dist.library}" basedir="${build.library}"/>
  -    <copyfile src="${conf.src}/${taglib.name}.tld" dest="${dist.tld}"/>
  +    <copy file="${conf.src}/${taglib.name}.tld" tofile="${dist.tld}"/>
     </target>
   
     <!-- Create the entire set of distribution files -->
  @@ -216,10 +207,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>