Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 37961 invoked from network); 14 Jan 2002 09:04:38 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 14 Jan 2002 09:04:38 -0000 Received: (qmail 3363 invoked by uid 97); 14 Jan 2002 09:04:40 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 3347 invoked by uid 97); 14 Jan 2002 09:04:39 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 3336 invoked by uid 97); 14 Jan 2002 09:04:39 -0000 Date: 14 Jan 2002 09:04:17 -0000 Message-ID: <20020114090417.86301.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder DefaultProjectBuilder.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 02/01/14 01:04:17 Modified: proposal/myrmidon/src/java/org/apache/myrmidon/components/builder DefaultProjectBuilder.java Log: If basedir of project is not specified then default to the same directory that contains build file. Submitted By: "Adam Murdoch" Revision Changes Path 1.22 +9 -4 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java Index: DefaultProjectBuilder.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- DefaultProjectBuilder.java 23 Dec 2001 06:25:34 -0000 1.21 +++ DefaultProjectBuilder.java 14 Jan 2002 09:04:17 -0000 1.22 @@ -122,13 +122,18 @@ } //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() ) { -- To unsubscribe, e-mail: For additional commands, e-mail: