mbenson 2004/06/04 10:51:21
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java
Log:
Changed default tempdir to java.io.tmpdir instead of user.dir. See what
breaks.
PR: 29391, 4590
Revision Changes Path
1.615 +3 -1 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- WHATSNEW 4 Jun 2004 12:25:13 -0000 1.614
+++ WHATSNEW 4 Jun 2004 17:51:21 -0000 1.615
@@ -26,7 +26,9 @@
* <loadproperties> supports loading from a resource.
-* <fail> accepts nested conditions.
+* <fail> accepts a nested <condition>.
+
+* Changed default tempdir for <javac> from user.dir to java.io.tmpdir.
Changes from Ant 1.6.1 to current Ant 1.6 CVS version
=====================================================
1.48 +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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- DefaultCompilerAdapter.java 9 Mar 2004 16:48:13 -0000 1.47
+++ DefaultCompilerAdapter.java 4 Jun 2004 17:51:21 -0000 1.48
@@ -396,12 +396,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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
