bodewig 2004/04/08 07:59:52
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Ant.java
Log:
merge
Revision Changes Path
No revision
No revision
1.92.2.7 +4 -2 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.92.2.6
retrieving revision 1.92.2.7
diff -u -r1.92.2.6 -r1.92.2.7
--- Ant.java 9 Mar 2004 17:01:32 -0000 1.92.2.6
+++ Ant.java 8 Apr 2004 14:59:52 -0000 1.92.2.7
@@ -322,10 +322,12 @@
+ " in build file " + antFile, Project.MSG_VERBOSE);
newProject.setUserProperty("ant.file" , antFile);
+ String thisAntFile = getProject().getProperty("ant.file");
// 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"))
+ if (thisAntFile != null
+ && newProject.resolveFile(newProject.getProperty("ant.file"))
+ .equals(getProject().resolveFile(thisAntFile))
&& getOwningTarget() != null) {
if (getOwningTarget().getName().equals("")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
