ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers DefaultCompilerAdapter.java
Date Wed, 26 Jan 2005 22:43:07 GMT
mbenson     2005/01/26 14:43:07

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               docs/manual/CoreTasks Tag: ANT_16_BRANCH javac.html
               src/main/org/apache/tools/ant/taskdefs/compilers Tag:
                        ANT_16_BRANCH DefaultCompilerAdapter.java
  Log:
  Merge basic switch to java.io.tmpdir via FileUtils.createTempFile(...)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.166 +2 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.165
  retrieving revision 1.503.2.166
  diff -u -r1.503.2.165 -r1.503.2.166
  --- WHATSNEW	26 Jan 2005 22:07:53 -0000	1.503.2.165
  +++ WHATSNEW	26 Jan 2005 22:43:07 -0000	1.503.2.166
  @@ -60,6 +60,8 @@
   * Made the dest attribute of the apply task optional; mapped target
     filenames will be interpreted as absolute pathnames when dest is omitted.
   
  +* Changed default tempdir for <javac> from user.dir to java.io.tmpdir.
  +
   Fixed bugs:
   -----------
   
  
  
  
  No                   revision
  No                   revision
  1.42.2.8  +3 -2      ant/docs/manual/CoreTasks/javac.html
  
  Index: javac.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/javac.html,v
  retrieving revision 1.42.2.7
  retrieving revision 1.42.2.8
  diff -u -r1.42.2.7 -r1.42.2.8
  --- javac.html	10 Dec 2004 23:17:34 -0000	1.42.2.7
  +++ javac.html	26 Jan 2005 22:43:07 -0000	1.42.2.8
  @@ -347,8 +347,9 @@
         This is only used if the task is forked and the
         command line args length exceeds 4k.
         <em>Since Ant 1.6</em>.</td>
  -    <td align="center" valign="top">No; default is the current working
  -       directory.</td>
  +    <td align="center" valign="top">
  +      No; default is <i>java.io.tmpdir</i>.
  +    </td>
     </tr>
   </table>
   
  
  
  
  No                   revision
  No                   revision
  1.41.2.8  +2 -6      ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.41.2.7
  retrieving revision 1.41.2.8
  diff -u -r1.41.2.7 -r1.41.2.8
  --- DefaultCompilerAdapter.java	29 Oct 2004 07:43:16 -0000	1.41.2.7
  +++ DefaultCompilerAdapter.java	26 Jan 2005 22:43:07 -0000	1.41.2.8
  @@ -404,12 +404,8 @@
                   && firstFileName >= 0) {
                   PrintWriter out = null;
                   try {
  -                    File userDir = getJavac().getTempdir();
  -                    if (userDir == null) {
  -                        String userDirName = System.getProperty("user.dir");
  -                        userDir = new File(userDirName);
  -                    }
  -                    tmpFile = fileUtils.createTempFile("files", "", userDir);
  +                    tmpFile = fileUtils.createTempFile(
  +                        "files", "", getJavac().getTempdir());
                       tmpFile.deleteOnExit();
                       out = new PrintWriter(new FileWriter(tmpFile));
                       for (int i = firstFileName; i < args.length; i++) {
  
  
  

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


Mime
View raw message