From 1c38f4ed52ca23857b7b83ca909cd1748dea88d6 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 31 Jul 2000 14:20:11 +0000 Subject: [PATCH] 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 --- src/main/org/apache/tools/ant/ProjectHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 4b57755f8..d9b673930 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -204,7 +204,7 @@ public class ProjectHelper { String def = null; String name = null; String id = null; - String baseDir = new File(buildFile.getAbsolutePath()).getParent(); + String baseDir = null; for (int i = 0; i < attrs.getLength(); i++) { String key = attrs.getName(i); @@ -233,7 +233,11 @@ public class ProjectHelper { if (project.getProperty("basedir") != null) { project.setBasedir(project.getProperty("basedir")); } 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()); + } } }