Browse Source

If basedir of project is not specified then default to the same directory that contains build file.

Submitted By: "Adam Murdoch" <adammurdoch@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270755 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
2cc1a6a0f7
1 changed files with 9 additions and 4 deletions
  1. +9
    -4
      proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java

+ 9
- 4
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java View File

@@ -122,13 +122,18 @@ public class DefaultProjectBuilder
} }


//get project-level attributes //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 defaultTarget = configuration.getAttribute( "default" );
//final String name = configuration.getAttribute( "name" ); //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() ) if( getLogger().isDebugEnabled() )
{ {


Loading…
Cancel
Save