bodewig 2002/07/05 04:36:08
Modified: src/main/org/apache/tools/ant Tag: ANT_15_BRANCH Main.java
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Ant.java CallTarget.java
Log:
Allow basedir to be re-set in triple (or even more often) nested
calls. Don't set the dir attribute explicitly when using <antcall>.
PR: 10492
Revision Changes Path
No revision
No revision
1.65.2.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.65.2.6
retrieving revision 1.65.2.7
diff -u -r1.65.2.6 -r1.65.2.7
--- Main.java 28 Jun 2002 23:10:03 -0000 1.65.2.6
+++ Main.java 5 Jul 2002 11:36:08 -0000 1.65.2.7
@@ -592,7 +592,7 @@
}
project.setUserProperty("ant.file",
- buildFile.getAbsolutePath());
+ buildFile.getAbsolutePath());
ProjectHelper.configureProject(project, buildFile);
No revision
No revision
1.56.2.8 +4 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.56.2.7
retrieving revision 1.56.2.8
diff -u -r1.56.2.7 -r1.56.2.8
--- Ant.java 25 Jun 2002 06:48:32 -0000 1.56.2.7
+++ Ant.java 5 Jul 2002 11:36:08 -0000 1.56.2.8
@@ -329,7 +329,10 @@
if (dir != null) {
newProject.setBaseDir(dir);
- newProject.setUserProperty("basedir" , dir.getAbsolutePath());
+ if (savedDir != null) { // has been set explicitly
+ newProject.setInheritedProperty("basedir" ,
+ dir.getAbsolutePath());
+ }
} else {
dir = project.getBaseDir();
}
1.21.2.2 +0 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
Index: CallTarget.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- CallTarget.java 18 Jun 2002 17:51:46 -0000 1.21.2.1
+++ CallTarget.java 5 Jul 2002 11:36:08 -0000 1.21.2.2
@@ -136,7 +136,6 @@
location);
}
- callee.setDir(getProject().getBaseDir());
callee.setAntfile(getProject().getProperty("ant.file"));
callee.setTarget(subTarget);
callee.setInheritAll(inheritAll);
--
To unsubscribe, e-mail: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>
|