cvs commit: jakarta-ant/src/main/org/apache/tools/ant ProjectHelper.java

[bodewig]

bodewig     00/09/08 00:21:02

  Modified:    src/main/org/apache/tools/ant ProjectHelper.java
  Log:
  <project basedir=""> didn't work for absolute filenames.
  Reported by:  Gardner, David <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.27      +6 -1      
jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ProjectHelper.java        2000/09/05 08:53:31     1.26
  +++ ProjectHelper.java        2000/09/08 07:20:57     1.27
  @@ -237,7 +237,12 @@
                   if (baseDir == null) {
                       project.setBasedir((new 
File(buildFileParent)).getAbsolutePath());
                   } else {
  -                    project.setBasedir((new File(buildFileParent, 
baseDir)).getAbsolutePath());
  +                    // check whether the user has specified an absolute path
  +                    if ((new File(baseDir)).isAbsolute()) {
  +                        project.setBasedir(baseDir);
  +                    } else {
  +                        project.setBasedir((new File(buildFileParent, 
baseDir)).getAbsolutePath());
  +                    }
                   }
               }