You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2001/07/19 08:38:01 UTC

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

bodewig     01/07/18 23:38:01

  Modified:    src/main/org/apache/tools/ant Main.java
  Log:
  Make sure "ant -find" will return a "normal" filename (without /./)
  for the build file.
  
  Reported by:            Costin Manolache <cm...@yahoo.com>
  Fix suggested by:	Jesse Glick <Je...@netbeans.com>
  
  I still think we should fix Project.resolveFile to handle ../ and ./
  sequences in rootDir as well.
  
  Revision  Changes    Path
  1.38      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Main.java	2001/07/17 12:12:39	1.37
  +++ Main.java	2001/07/19 06:38:01	1.38
  @@ -297,7 +297,8 @@
           if (buildFile == null) {
               // but -find then search for it
               if (searchForThis != null) {
  -                buildFile = findBuildFile(".", searchForThis);
  +                buildFile = findBuildFile(System.getProperty("user.dir"), 
  +                                          searchForThis);
               } else {
                   buildFile = new File(DEFAULT_BUILD_FILENAME);
               }