jon 01/09/19 09:32:44
Modified: catalina Tag: tomcat_40_branch build.xml
Log:
port sam's tyrex dependency patch back to the branch
fix things so that you don't have to hand edit this file in order to build
tomcat. the problem is that the JSSE stuff was commented out and things
wouldn't compile because of that. if you wanted to compile, you had to
hand edit this file and uncomment things. the real issue is that the JSSE
stuff is only a problem when you want to make a distribution...so don't
allow people to do that.
Revision Changes Path
No revision
No revision
1.60.2.1 +14 -9 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
retrieving revision 1.60.2.1
diff -u -r1.60 -r1.60.2.1
--- build.xml 2001/09/16 04:58:28 1.60
+++ build.xml 2001/09/19 16:32:43 1.60.2.1
@@ -85,7 +85,11 @@
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static" depends="build-prepare">
+ <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">
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
@@ -102,22 +106,15 @@
<copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
<copy todir="${catalina.build}/common/lib" file="${copy.crimson.jar}"/>
<copy todir="${catalina.build}/common/lib" file="${copy.jaxp.jar}"/>
-<!-- Cannot redistribute JSSE
- <copy todir="${catalina.build}/common/lib" file="${jcert.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}"/>
--->
-<!-- Cannot redistribute JSSE
<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}"/>
<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}"/>
<!-- Configuration Files -->
<copy todir="${catalina.build}/conf">
@@ -456,6 +453,14 @@
<copy todir="${catalina.dist}/common/lib">
<fileset dir="${catalina.build}/common/lib" />
</copy>
+
+ <!-- Cannot redistribute JSSE -->
+ <echo>
+ Cannot redistribute JSSE. Deleting jars from distribution.
+ </echo>
+ <delete file="${catalina.deploy}/common/lib/jcert.jar"/>
+ <delete file="${catalina.deploy}/common/lib/jnet.jar"/>
+ <delete file="${catalina.deploy}/common/lib/jsse.jar"/>
<!-- Configuration Files -->
<mkdir dir="${catalina.dist}/conf"/>
