billbarker    2005/06/17 21:16:57

  Modified:    .        build.xml
  Log:
  Update to support building the APR connectors.
  
  This was actually badly broken before (like, for months :).  It's nice to see 
that the TC 3.3 community is so active ;-).
  
  Revision  Changes    Path
  1.208     +7 -2      jakarta-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/build.xml,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -r1.207 -r1.208
  --- build.xml 15 Apr 2005 03:17:08 -0000      1.207
  +++ build.xml 18 Jun 2005 04:16:56 -0000      1.208
  @@ -428,7 +428,7 @@
          <property name="version" value="1.0.0" />
        </ant>
     </target>
  -  <target name="dep.tomcat-util" unless="tomcat-util.is.uptodate"
  +  <target name="dep.tomcat-util"  unless="tomcat-util.is.uptodate"
             depends="dep.tomcat-jni"
             description="Build j-t-c util which we depend on. To be called 
before main">
       <ant dir="${jtc.util.home}" />
  @@ -448,9 +448,13 @@
               <property name="tomcat-jni.jar" value="${tomcat-jni.jar}" />
           </ant>
               
  -        <ant dir="${jtc.jk.home}" target="build-jk">
  +        <ant dir="${jtc.jk.home}" target="build-jk" inheritAll="false">
               <property name="tomcat33.home" value="${tomcat.build}"/>
               <property name="servlet-api.jar" 
value="${basedir}/${servlet22.jar}"/>
  +            <property name="tomcat-apr.jar" value="${tomcat-jni.jar}" />
  +            <property name="jmx.jar" value="${jmx.jar}" />
  +            <property name="commons-modeler.jar" 
value="${commons-modeler.jar}" />
  +            <property name="commons-logging.jar" 
value="${commons-logging.jar}" />
           </ant>
     </target>
   
  @@ -1236,6 +1240,7 @@
       <ant dir="${jakarta-tomcat-connectors}/coyote" target="clean" />
       <ant dir="${jakarta-tomcat-connectors}/http11" target="clean" />
       <ant dir="${jakarta-tomcat-connectors}/jk" target="clean" />
  +    <ant dir="${jakarta-tomcat-connectors}/jni" target="clean" />
     </target>
   
     <target name="all" depends="clean,dist"/>
  
  
  

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

Reply via email to