cvs commit: jakarta-tomcat-4.0/catalina build.xml

[remm]

remm        01/09/20 10:41:03

  Modified:    catalina Tag: tomcat_40_branch build.xml
  Log:
  - Don't copy ldap.jar until further notice.
  - Copy tyrex.license.
  - Revert Sam's patch on conditional copy of Tyrex (if we're using conditional
    compilation, we should backport from the HEAD branch IMO).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.60.2.2  +7 -5      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.1
  retrieving revision 1.60.2.2
  diff -u -r1.60.2.1 -r1.60.2.2
  --- build.xml 2001/09/19 16:32:43     1.60.2.1
  +++ build.xml 2001/09/20 17:41:03     1.60.2.2
  @@ -85,11 +85,7 @@
   
   
     <!-- =================== BUILD: Copy Static Files ======================= -->
  -  <target name="copy-tyrex" depends="build-prepare" if="tyrex.present">
  -    <copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
  -  </target>
  -
  -  <target name="build-static" depends="build-prepare,copy-tyrex">
  +  <target name="build-static" depends="build-prepare">
   
       <!-- Executable Commands -->
       <copy todir="${catalina.build}/bin">
  @@ -108,13 +104,19 @@
       <copy todir="${catalina.build}/common/lib" file="${copy.jaxp.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/>
  +<!-- Cannot redistribute JSSE
       <copy todir="${catalina.build}/common/lib" file="${jnet.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${jcert.jar}"/>
  +-->
       <copy todir="${catalina.build}/common/lib" file="${jta.jar}"/>
  +<!-- Connot redistribute LDAP
       <copy todir="${catalina.build}/common/lib" file="${ldap.jar}"/>
  +-->
       <copy todir="${catalina.build}/common/lib" file="${mail.jar}"/>
       <copy todir="${catalina.build}/common/lib" file="${servlet.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
  +    <copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
   
       <!-- Configuration Files -->
       <copy todir="${catalina.build}/conf">