From 2cc1a6a0f7c85eb8fd1a47cfd2e1825ab3eb6436 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Mon, 14 Jan 2002 09:04:17 +0000 Subject: [PATCH] If basedir of project is not specified then default to the same directory that contains build file. Submitted By: "Adam Murdoch" git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270755 13f79535-47bb-0310-9956-ffa450edef68 --- .../components/builder/DefaultProjectBuilder.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java index e49f0ab2e..f956a9bae 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java @@ -122,13 +122,18 @@ public class DefaultProjectBuilder } //get project-level attributes - final String baseDirectoryName = configuration.getAttribute( "basedir" ); + final String baseDirectoryName = configuration.getAttribute( "basedir", null ); final String defaultTarget = configuration.getAttribute( "default" ); //final String name = configuration.getAttribute( "name" ); - //determine base directory for project - final File baseDirectory = - ( new File( file.getParentFile(), baseDirectoryName ) ).getAbsoluteFile(); + //determine base directory for project. Use the directory containing + //the build file as the default. + File baseDirectory = file.getParentFile(); + if( baseDirectoryName != null ) + { + baseDirectory = new File( baseDirectory, baseDirectoryName ); + } + baseDirectory = baseDirectory.getAbsoluteFile(); if( getLogger().isDebugEnabled() ) {