bobh 2002/08/15 06:56:31
Modified: catalina build.xml
Log:
Change conditional building of Tyrex component to follow this rule,
(full.dist==true) or ( jta.present == true and tyrex.present)
Revision Changes Path
1.17 +7 -7 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 14 Aug 2002 21:39:42 -0000 1.16
+++ build.xml 15 Aug 2002 13:56:31 -0000 1.17
@@ -348,13 +348,13 @@
</condition>
<property name="compile.ssi" value="true"/>
<condition property="compile.tyrex">
- <and>
- <equals arg1="${jta.present}" arg2="true" />
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${tyrex.present}" arg2="true" />
- </or>
- </and>
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <and>
+ <equals arg1="${jta.present}" arg2="true" />
+ <equals arg1="${tyrex.present}" arg2="true" />
+ </and>
+ </or>
</condition>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
