diff options
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/sabbus/ScalacFork.scala | 16 |
4 files changed, 15 insertions, 7 deletions
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index a72f5d156f..c83384afed 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -23ed042f5ae2ff6940d8881720ae23e4e7b0618a ?scala-compiler.jar +0b932d9548029d992264f0780fd5e24b2d0b7c61 ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index 6e01caf0bb..c0ba53e5f4 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -f6cd4cb1ea1f7bcf895a81c68f0c86e71e44eaa2 ?scala-library-src.jar +6761a76f6314540a9a69f4b45419a1d4d8b71773 ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index 20eb322b1c..0772bdf9d7 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -156f2c38ad2cd8b4e0c30b40e7aa5a900c2502ec ?scala-library.jar +6ac2e1d59fdb05902788b1e55ca8dbf391504a32 ?scala-library.jar diff --git a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala index c3d232b16d..8be3d4a4e3 100644 --- a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala +++ b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala @@ -11,6 +11,7 @@ package scala.tools.ant.sabbus import java.io.File +import java.io.FileWriter import org.apache.tools.ant.Project import org.apache.tools.ant.taskdefs.{MatchingTask, Java} import org.apache.tools.ant.util.{GlobPatternMapper, SourceFileScanner} @@ -84,12 +85,19 @@ class ScalacFork extends MatchingTask with TaskArgs { java.setClasspath(compilerPath.get) java.setClassname("scala.tools.nsc.Main") if (!timeout.isEmpty) java.setTimeout(timeout.get) + + //dump the arguments to a file and do "java @file" + val tempArgFile = File.createTempFile("scalacfork","") + val outf = new FileWriter(tempArgFile) for (arg <- settings.toArgs) - java.createArg().setValue(arg) + { outf.write(arg) ; outf.write(" ") } for (file <- includedFiles) - java.createArg().setFile(file) - for (af <- argfile) - java.createArg().setValue("@"+ af) + { outf.write(file.getPath) ; outf.write(" ") } + outf.close + + java.createArg().setValue("@"+ tempArgFile.getAbsolutePath) + if (argfile.isDefined) + java.createArg().setValue("@"+ argfile.get) log(java.getCommandLine.getCommandline.mkString("", " ", ""), Project.MSG_VERBOSE) val res = java.executeJava() |