costin      01/06/24 14:53:17

  Modified:    .        build.xml
  Log:
  Use the new build.xml in j-t-c
  
  Revision  Changes    Path
  1.137     +8 -17     jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -r1.136 -r1.137
  --- build.xml 2001/06/22 05:26:56     1.136
  +++ build.xml 2001/06/24 21:53:17     1.137
  @@ -433,21 +433,9 @@
     </target>
   
     <target name="connector" depends="init">
  -    <javac destdir="${tomcat.build}/classes"
  -           debug="${debug}"
  -           optimize="${optimize}"
  -           deprecation="off"
  -           srcdir="${jakarta-tomcat-connectors}/jk/java">
  -      <classpath>
  -      </classpath>
  -      <include name="org/apache/ajp/tomcat33/**"/>
  -    </javac>
  -
  -    <jar jarfile="${tomcat.build}/lib/container/jk_connector.jar"
  -         basedir="${tomcat.build}/classes">
  -      <include name="org/apache/ajp/tomcat33/**"/>
  -    </jar>
  -
  +    <ant antfile="${jakarta-tomcat-connectors}/jk/build.xml"
  +         target="build-tomcat33" 
  +      dir="${jakarta-tomcat-connectors}/jk" />
     </target>
   
   
  @@ -500,7 +488,7 @@
            target="install"/>
     </target>
   
  -  <target name="tomcat-jars" 
depends="prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,connector,tomcat_modules,facade22,tomcat-startup,jasper34">
  +  <target name="tomcat-jars" 
depends="prepare,connector_util,tomcat_util,tomcat.jar,stop-tomcat.jar,tomcat_core,jasper,tomcat_modules,connector,facade22,tomcat-startup,jasper34">
     </target>
   
     <target name="tomcat-jars-new" depends="tomcat-jars">
  @@ -753,12 +741,15 @@
     </target>
   
     <target name="clean-classes" depends="init">
  -    <delete dir="${tomcat.build}/classes/org"/>
  +    <delete dir="${tomcat.build}/classes"/>
  +    <delete dir="${tomcat.build}/lib"/>
  +    <delete dir="${jakarta-tomcat-jasper}/build" />
     </target>
   
     <target name="clean" depends="init">
       <delete dir="${tomcat.build}"/>
       <delete dir="${tomcat.dist}"/>
  +    <delete dir="${jakarta-tomcat-jasper}/build" />
     </target>
   
     <target name="all" depends="clean,dist"/>
  
  
  

Reply via email to