Browse Source

Mark entry and exit of <ant> and <antcall>

PR:	22718
Submitted by:	Jesse Glick


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275227 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 21 years ago
parent
commit
d189eb07a3
1 changed files with 9 additions and 7 deletions
  1. +9
    -7
      src/main/org/apache/tools/ant/taskdefs/Ant.java

+ 9
- 7
src/main/org/apache/tools/ant/taskdefs/Ant.java View File

@@ -226,8 +226,7 @@ public class Ant extends Task {
addAlmostAll(getProject().getProperties()); addAlmostAll(getProject().getProperties());
} }


Enumeration e;
e = propertySets.elements();
Enumeration e = propertySets.elements();
while (e.hasMoreElements()) { while (e.hasMoreElements()) {
PropertySet ps = (PropertySet) e.nextElement(); PropertySet ps = (PropertySet) e.nextElement();
addAlmostAll(ps.getProperties()); addAlmostAll(ps.getProperties());
@@ -339,7 +338,8 @@ public class Ant extends Task {


if (dir != null) { if (dir != null) {
newProject.setBaseDir(dir); newProject.setBaseDir(dir);
if (savedDir != null) { // has been set explicitly
if (savedDir != null) {
// has been set explicitly
newProject.setInheritedProperty("basedir" , newProject.setInheritedProperty("basedir" ,
dir.getAbsolutePath()); dir.getAbsolutePath());
} }
@@ -357,8 +357,7 @@ public class Ant extends Task {
antFile = file.getAbsolutePath(); antFile = file.getAbsolutePath();


log("calling target " + (target != null ? target : "[default]") log("calling target " + (target != null ? target : "[default]")
+ " in build file " + antFile.toString(),
Project.MSG_VERBOSE);
+ " in build file " + antFile, Project.MSG_VERBOSE);
newProject.setUserProperty("ant.file" , antFile); newProject.setUserProperty("ant.file" , antFile);


// Are we trying to call the target in which we are defined (or // Are we trying to call the target in which we are defined (or
@@ -410,9 +409,12 @@ public class Ant extends Task {


addReferences(); addReferences();


if (target != null) {
if (!"".equals(target)) {
if (target != null && !"".equals(target)) {
try {
log("Entering " + antFile + "...");
newProject.executeTarget(target); newProject.executeTarget(target);
} finally {
log("Exiting " + antFile + ".");
} }
} }
} finally { } finally {


Loading…
Cancel
Save