You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2004/12/01 14:45:49 UTC

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs SubAnt.java

peterreilly    2004/12/01 05:45:49

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs SubAnt.java
  Log:
  use absolute path instread of canonical path in subant
  PR: 30438
  
  Revision  Changes    Path
  1.691     +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.690
  retrieving revision 1.691
  diff -u -r1.690 -r1.691
  --- WHATSNEW	1 Dec 2004 11:25:46 -0000	1.690
  +++ WHATSNEW	1 Dec 2004 13:45:48 -0000	1.691
  @@ -103,6 +103,9 @@
   Changes that could break older environments:
   --------------------------------------------
   
  +* The subant task used the canonical version of a file path. This
  +  has been changed to use the absolute path. Bugzilla 30438.
  +
   Other changes:
   --------------
   
  
  
  
  1.20      +1 -7      ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
  
  Index: SubAnt.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SubAnt.java	22 Nov 2004 09:23:28 -0000	1.19
  +++ SubAnt.java	1 Dec 2004 13:45:48 -0000	1.20
  @@ -253,13 +253,7 @@
           }
   
           ant = createAntTask(directory);
  -        String antfilename = null;
  -        try {
  -            antfilename = file.getCanonicalPath();
  -        } catch (IOException e) {
  -            throw new BuildException(e);
  -        }
  -
  +        String antfilename = file.getAbsolutePath()
           ant.setAntfile(antfilename);
           try {
               ant.execute();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org