mbenson 2004/02/20 14:15:52
Modified: src/main/org/apache/tools/ant/taskdefs Ant.java
. WHATSNEW
Log:
Cause AntLikeTasksAtTopLevelTest to pass on cygwin.
Revision Changes Path
1.98 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- Ant.java 9 Feb 2004 21:05:19 -0000 1.97
+++ Ant.java 20 Feb 2004 22:15:52 -0000 1.98
@@ -325,9 +325,9 @@
// Are we trying to call the target in which we are defined (or
// the build file if this is a top level task)?
- if (newProject.getProperty("ant.file")
- .equals(getProject().getProperty("ant.file"))
- && getOwningTarget() != null) {
+ if (newProject.resolveFile(newProject.getProperty("ant.file"))
+ .equals(getProject().resolveFile(getProject()
+ .getProperty("ant.file"))) && getOwningTarget() != null) {
if (getOwningTarget().getName().equals("")) {
if (getTaskName().equals("antcall")) {
1.548 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -r1.547 -r1.548
--- WHATSNEW 19 Feb 2004 21:14:16 -0000 1.547
+++ WHATSNEW 20 Feb 2004 22:15:52 -0000 1.548
@@ -23,6 +23,8 @@
* replacestring tokenfilter only replaced the first occurrence.
+* AntLikeTasksAtTopLevelTest failed on cygwin.
+
Other changes:
--------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
