mbenson 2004/07/13 09:11:27
Modified: src/etc/testcases/taskdefs/exec Tag: ANT_16_BRANCH apply.xml
Log:
Merge
Revision Changes Path
No revision
No revision
1.3.2.3 +12 -5 ant/src/etc/testcases/taskdefs/exec/apply.xml
Index: apply.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/exec/apply.xml,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- apply.xml 9 Jul 2004 22:37:33 -0000 1.3.2.2
+++ apply.xml 13 Jul 2004 16:11:27 -0000 1.3.2.3
@@ -21,6 +21,16 @@
<isset property="sed.exe.executable"/>
</or>
</condition>
+ <!-- UNIX -->
+ <available file="echo" filepath="${env.PATH}"
property="echo.executable"/>
+ <!-- CYGWIN -->
+ <available file="echo.exe" filepath="${env.PATH}"
property="echo.exe.executable"/>
+ <condition property="echo.can.run">
+ <or>
+ <isset property="echo.executable"/>
+ <isset property="echo.exe.executable"/>
+ </or>
+ </condition>
</target>
<target name="xyz">
@@ -303,12 +313,9 @@
</apply>
</target>
- <target name="ignoremissing">
+ <target name="ignoremissing" depends="init,xyz" if="echo.can.run">
<filelist id="xylist" dir="${basedir}" files="x,y" />
- <filelist id="xyzlist" dir="${basedir}" files="x,y,z" />
-
- <touch file="x" />
- <touch file="y" />
+ <delete file="z" />
<condition property="pad" value="">
<or>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
