Browse Source

Didn't set the basedir correctly if the attribute to project was

ommitted and the basedir was not the process's working directory.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267857 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 25 years ago
parent
commit
1c38f4ed52
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      src/main/org/apache/tools/ant/ProjectHelper.java

+ 6
- 2
src/main/org/apache/tools/ant/ProjectHelper.java View File

@@ -204,7 +204,7 @@ public class ProjectHelper {
String def = null; String def = null;
String name = null; String name = null;
String id = null; String id = null;
String baseDir = new File(buildFile.getAbsolutePath()).getParent();
String baseDir = null;


for (int i = 0; i < attrs.getLength(); i++) { for (int i = 0; i < attrs.getLength(); i++) {
String key = attrs.getName(i); String key = attrs.getName(i);
@@ -233,7 +233,11 @@ public class ProjectHelper {
if (project.getProperty("basedir") != null) { if (project.getProperty("basedir") != null) {
project.setBasedir(project.getProperty("basedir")); project.setBasedir(project.getProperty("basedir"));
} else { } else {
project.setBasedir((new File(buildFile.getParent(), baseDir)).getAbsolutePath());
if (baseDir == null) {
project.setBasedir((new File(buildFile.getParent())).getAbsolutePath());
} else {
project.setBasedir((new File(buildFile.getParent(), baseDir)).getAbsolutePath());
}
} }


} }


Loading…
Cancel
Save