remm 02/02/07 23:03:25
Modified: catalina build.xml
Log:
- Add the possibility to build a minimal JDK 1.4 optimized distribution.
Revision Changes Path
1.103 +146 -86 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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- build.xml 7 Feb 2002 16:49:37 -0000 1.102
+++ build.xml 8 Feb 2002 07:03:25 -0000 1.103
@@ -322,52 +322,77 @@
<!-- Conditional copy flags (determined from the flags above) -->
<condition property="copy.dbcp.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${dbcp.present}" arg2="true" />
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${dbcp.present}" arg2="true" />
+ </or>
+ </and>
</condition>
<condition property="copy.jaas.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jaas.jar.present}" arg2="true" />
- <not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </not>
- </and>
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <and>
+ <equals arg1="${jaas.jar.present}" arg2="true" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
+ </and>
+ </or>
+ </and>
</condition>
<condition property="copy.jdbc20ext.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jdbc20ext.jar.present}" arg2="true" />
- <not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </not>
- </and>
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <and>
+ <equals arg1="${jdbc20ext.jar.present}" arg2="true" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
+ </and>
+ </or>
+ </and>
</condition>
<condition property="copy.jndi.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jndi.jar.present}" arg2="true" />
- <not>
- <or>
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </or>
- </not>
- </and>
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <and>
+ <equals arg1="${jndi.jar.present}" arg2="true" />
+ <not>
+ <or>
+ <equals arg1="${jdk.1.3.present}" arg2="true" />
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </or>
+ </not>
+ </and>
+ </or>
+ </and>
</condition>
<condition property="copy.javamail.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${javamail.jar.present}" arg2="true" />
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${javamail.jar.present}" arg2="true" />
+ </or>
+ </and>
</condition>
<condition property="copy.jmx.jar">
<or>
@@ -376,37 +401,52 @@
</or>
</condition>
<condition property="copy.jta.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jta.jar.present}" arg2="true" />
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${jta.jar.present}" arg2="true" />
+ </or>
+ </and>
</condition>
<condition property="copy.ldap.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${ldap.jar.present}" arg2="true" />
- <not>
- <or>
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </or>
- </not>
- </and>
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <and>
+ <equals arg1="${ldap.jar.present}" arg2="true" />
+ <not>
+ <or>
+ <equals arg1="${jdk.1.3.present}" arg2="true" />
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </or>
+ </not>
+ </and>
+ </or>
+ </and>
</condition>
<condition property="copy.jsse.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jcert.jar.present}" arg2="true" />
- <equals arg1="${jnet.jar.present}" arg2="true" />
- <equals arg1="${jsse.jar.present}" arg2="true" />
- <not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </not>
- </and>
- </or>
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <and>
+ <equals arg1="${jcert.jar.present}" arg2="true" />
+ <equals arg1="${jnet.jar.present}" arg2="true" />
+ <equals arg1="${jsse.jar.present}" arg2="true" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
+ </and>
+ </or>
+ </and>
</condition>
<condition property="copy.modeler.jar">
<or>
@@ -421,40 +461,60 @@
</or>
</condition>
<condition property="copy.pool.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${pool.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.tyrex.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${tyrex.jar.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.xerces.jar">
<and>
- <equals arg1="${xerces.jar.present}" arg2="true" />
<not>
- <equals arg1="${xerces2.jars.present}" arg2="true" />
+ <equals arg1="${light.dist}" arg2="on" />
</not>
<or>
<equals arg1="${full.dist}" arg2="on" />
- <not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </not>
+ <equals arg1="${pool.present}" arg2="true" />
</or>
</and>
</condition>
- <condition property="copy.xerces2.jars">
+ <condition property="copy.tyrex.jar">
<and>
- <equals arg1="${xerces2.jars.present}" arg2="true" />
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
<or>
<equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${tyrex.jar.present}" arg2="true" />
+ </or>
+ </and>
+ </condition>
+ <condition property="copy.xerces.jar">
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <and>
+ <equals arg1="${xerces.jar.present}" arg2="true" />
<not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
+ <equals arg1="${xerces2.jars.present}" arg2="true" />
</not>
- </or>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
+ </or>
+ </and>
+ </and>
+ </condition>
+ <condition property="copy.xerces2.jars">
+ <and>
+ <not>
+ <equals arg1="${light.dist}" arg2="on" />
+ </not>
+ <and>
+ <equals arg1="${xerces2.jars.present}" arg2="true" />
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
+ </or>
+ </and>
</and>
</condition>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
