remm 02/02/07 23:19:32
Modified: catalina Tag: tomcat_40_branch build.xml
Log:
- Add the possibility to build a minimal JDK 1.4 optimized distribution.
Revision Changes Path
No revision
No revision
1.60.2.9 +100 -60 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.8
retrieving revision 1.60.2.9
diff -u -r1.60.2.8 -r1.60.2.9
--- build.xml 12 Oct 2001 19:55:34 -0000 1.60.2.8
+++ build.xml 8 Feb 2002 07:19:32 -0000 1.60.2.9
@@ -217,82 +217,122 @@
</or>
</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.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.tyrex.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${tyrex.jar.present}" arg2="true" />
- </or>
+ <and>
+ <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">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
+ <and>
<not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
+ <equals arg1="${light.dist}" arg2="on" />
</not>
- </or>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
+ </or>
+ </and>
</condition>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
