bodewig 2003/10/06 07:25:31
Modified: src/etc/testcases/taskdefs/optional Tag: ANT_16_BRANCH
dotnet.xml
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.13.2.2 +9 -4 ant/src/etc/testcases/taskdefs/optional/dotnet.xml
Index: dotnet.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- dotnet.xml 23 Sep 2003 08:29:07 -0000 1.13.2.1
+++ dotnet.xml 6 Oct 2003 14:25:31 -0000 1.13.2.2
@@ -90,10 +90,15 @@
<echo> dotnetapps.found=${dotnetapps.found}</echo>
<condition property="mono.executable" value="mono">
- <or>
- <available file="mono" filepath="${env.PATH}" />
- <available file="mono.exe" filepath="${env.PATH}" />
- </or>
+ <and>
+ <not>
+ <os family="mac"/>
+ </not>
+ <or>
+ <available file="mono" filepath="${env.PATH}" />
+ <available file="mono.exe" filepath="${env.PATH}" />
+ </or>
+ </and>
</condition>
<property name="mono.executable" value="mint"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]