remm 01/09/19 13:30:54
Modified: catalina build.xml
Log:
- Don't copy ldap.jar.
- Copy tyrex.license if we're copying the Tyrex JAR. We could also put that file
in catalina/etc, but that's a minor issue.
- Start using some conditional compilation flags.
- It may be useful to display the flags before starting building (so that if it
fails,
it's very easy to figure out why). Should I display them by default ?
Revision Changes Path
1.63 +9 -0 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 2001/09/19 18:00:58 1.62
+++ build.xml 2001/09/19 20:30:54 1.63
@@ -345,10 +345,13 @@
<copy todir="${catalina.build}/common/lib" file="${jta.jar}"/>
</target>
<target name="copy-ldap.jar" if="copy.ldap.jar">
+ <!-- Licensing issue: don't copy ldap.jar
<copy todir="${catalina.build}/common/lib" file="${ldap.jar}"/>
+ -->
</target>
<target name="copy-tyrex.jar" if="copy.tyrex.jar">
<copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
+ <copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
</target>
@@ -410,6 +413,12 @@
<exclude name="**/util/ProcessHelper.java" unless="jdk.1.3.present"/>
<exclude name="**/servlets/CGIServlet.java" unless="jdk.1.3.present"/>
<exclude name="**/Tyrex*.java" unless="compile.tyrex"/>
+ <exclude name="**/net/SSLServerSocketFactory.java"
+ unless="compile.jsse"/>
+ <exclude name="**/naming/factory/MailSessionFactory.java"
+ unless="compile.javamail"/>
+ <exclude name="**/naming/factory/SendMailFactory.java"
+ unless="compile.javamail"/>
</javac>
<!-- Copy static resource files -->
