Browse Source

Changed default tempdir to java.io.tmpdir instead of user.dir. See what breaks.

PR: 29391, 4590


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276531 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 21 years ago
parent
commit
dc899ea41e
2 changed files with 5 additions and 7 deletions
  1. +3
    -1
      WHATSNEW
  2. +2
    -6
      src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

+ 3
- 1
WHATSNEW View File

@@ -26,7 +26,9 @@ Other changes:


* <loadproperties> supports loading from a resource. * <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 Changes from Ant 1.6.1 to current Ant 1.6 CVS version
===================================================== =====================================================


+ 2
- 6
src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -396,12 +396,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
&& firstFileName >= 0) { && firstFileName >= 0) {
PrintWriter out = null; PrintWriter out = null;
try { 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(); tmpFile.deleteOnExit();
out = new PrintWriter(new FileWriter(tmpFile)); out = new PrintWriter(new FileWriter(tmpFile));
for (int i = firstFileName; i < args.length; i++) { for (int i = firstFileName; i < args.length; i++) {


Loading…
Cancel
Save