tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina build.xml
Date Thu, 27 Jun 2002 14:44:47 GMT
hgomez      2002/06/27 07:44:47

  Modified:    catalina Tag: tomcat_40_branch build.xml
  Log:
  PR: Allow you to build TC 4.0 without coyote jar present in system,
  since coyote need TC 4.0 to be build, we fix a chicken&eggs problem
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.60.2.13 +8 -1      jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.60.2.12
  retrieving revision 1.60.2.13
  diff -u -r1.60.2.12 -r1.60.2.13
  --- build.xml	11 May 2002 01:20:14 -0000	1.60.2.12
  +++ build.xml	27 Jun 2002 14:44:47 -0000	1.60.2.13
  @@ -135,6 +135,7 @@
   
       <!-- JAR files availability flags -->
       <available property="tomcat-ajp.jar.present" file="${tomcat-ajp.jar}" />
  +    <available property="tomcat-coyote.jar.present" file="${tomcat-coyote.jar}" />
       <condition property="javamail.jar.present">
         <and>
           <available file="${activation.jar}" />
  @@ -216,6 +217,12 @@
           <equals arg1="${tomcat-ajp.jar.present}" arg2="true" />
         </or>
       </condition>
  +    <condition property="copy.tomcat-coyote.jar">
  +      <or>
  +        <equals arg1="${full.dist}" arg2="on" />
  +        <equals arg1="${tomcat-coyote.jar.present}" arg2="true" />
  +      </or>
  +    </condition>
       <condition property="copy.jdbc20ext.jar">
         <and>
           <not>
  @@ -435,7 +442,7 @@
     <target name="copy-tomcat-ajp.jar" if="copy.tomcat-ajp.jar">
       <copy todir="${catalina.build}/server/lib" file="${tomcat-ajp.jar}"/>
     </target>
  -  <target name="copy-tomcat-coyote.jar">
  +  <target name="copy-tomcat-coyote.jar" if="copy.tomcat-coyote.jar">
       <copy todir="${catalina.build}/server/lib" file="${commons-logging.jar}"/>
       <copy todir="${catalina.build}/server/lib" file="${tomcat-coyote.jar}"/>
       <copy todir="${catalina.build}/server/lib" file="${tomcat-http11.jar}"/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message