On Thu, 2002-08-15 at 00:05, Steve Downey wrote:
> (jta.present == true) and (full.dist=true or tyrex.present)

Yea, your right.  I will change that to,

(full.dist==true) or ( jta.present == true and tyrex.present)

Does that sound ok?

Cheers,
-bob

> 
> If I'm reading this correctly, this won't build the Tyrex dependant components 
> if jta is not present, EVEN IF full.dist is requested. That means you can set 
> full.dist on and NOT get a full dist.
> 
> If full.dist is set true, then the build should fail if some component is 
> missing. At least it's that way for all other components.
> 
> On Wednesday 14 August 2002 05:39 pm, [EMAIL PROTECTED] wrote:
> > bobh        2002/08/14 14:39:42
> >
> >   Modified:    catalina build.xml
> >   Log:
> >   make Tyrex only compile if JTA is present (this was breaking my build.)
> >
> >   Revision  Changes    Path
> >   1.16      +7 -4      jakarta-tomcat-catalina/catalina/build.xml
> >
> >   Index: build.xml
> >   ===================================================================
> >   RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
> >   retrieving revision 1.15
> >   retrieving revision 1.16
> >   diff -u -r1.15 -r1.16
> >   --- build.xml     13 Aug 2002 16:26:11 -0000      1.15
> >   +++ build.xml     14 Aug 2002 21:39:42 -0000      1.16
> >   @@ -348,10 +348,13 @@
> >        </condition>
> >        <property name="compile.ssi" value="true"/>
> >        <condition property="compile.tyrex">
> >   -      <or>
> >   -        <equals arg1="${full.dist}" arg2="on" />
> >   -        <equals arg1="${tyrex.present}" arg2="true" />
> >   -      </or>
> >   +      <and>
> >   +        <equals arg1="${jta.present}" arg2="true" />
> >   +        <or>
> >   +           <equals arg1="${full.dist}" arg2="on" />
> >   +           <equals arg1="${tyrex.present}" arg2="true" />
> >   +        </or>
> >   +      </and>
> >        </condition>
> 
> 
> --
> To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
-- 
Cheers,
-bob


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to