mbenson 2004/07/09 15:37:33
Modified: src/etc/testcases/taskdefs/exec Tag: ANT_16_BRANCH apply.xml
Log:
Merge
Revision Changes Path
No revision
No revision
1.3.2.2 +28 -4 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.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- apply.xml 23 Jun 2004 19:30:14 -0000 1.3.2.1
+++ apply.xml 9 Jul 2004 22:37:33 -0000 1.3.2.2
@@ -310,13 +310,37 @@
<touch file="x" />
<touch file="y" />
- <pathconvert property="xy" pathsep="${line.separator}">
+ <condition property="pad" value="">
+ <or>
+ <not>
+ <os family="dos" />
+ </not>
+ <not>
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.1" />
+ <equals arg1="${ant.java.version}" arg2="1.2" />
+ </or>
+ </not>
+ </or>
+ </condition>
+
+ <condition property="pad" value=" ">
+ <and>
+ <os family="dos" />
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.1" />
+ <equals arg1="${ant.java.version}" arg2="1.2" />
+ </or>
+ </and>
+ </condition>
+
+ <pathconvert property="xy" pathsep="${pad}${line.separator}">
<path>
<filelist refid="xylist" />
</path>
</pathconvert>
- <pathconvert property="xyz" pathsep="${line.separator}">
+ <pathconvert property="xyz" pathsep="${pad}${line.separator}">
<path>
<filelist refid="xyzlist" />
</path>
@@ -336,8 +360,8 @@
<condition>
<not>
<and>
- <equals arg1="${xy}" arg2="${ignoretrue}" />
- <equals arg1="${xyz}" arg2="${ignorefalse}" />
+ <equals arg1="${xy}${pad}" arg2="${ignoretrue}" />
+ <equals arg1="${xyz}${pad}" arg2="${ignorefalse}" />
</and>
</not>
</condition>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
