diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-06-16 18:51:55 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-06-16 18:51:55 +0000 |
| commit | a99d8f02f69610f37e8de0336270cfc61eb2ad1e (patch) | |
| tree | a8b29137ed1fb5bd3e78f53a1e9ca9dde0d267b0 | |
| parent | dfd5834a058206ecd2e5927e0cf8137362196016 (diff) | |
| download | scala-a99d8f02f69610f37e8de0336270cfc61eb2ad1e.tar.gz scala-a99d8f02f69610f37e8de0336270cfc61eb2ad1e.tar.bz2 scala-a99d8f02f69610f37e8de0336270cfc61eb2ad1e.zip | |
Merged revisions 22322 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22322 | extempore | 2010-06-16 19:32:47 +0200 (Wed, 16 Jun 2010) | 2 lines
Fixed a bug in scripts which put the classfile directory at the wrong
end of the classpath. No review. ........
| -rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index a7d67a3af9..032e8d0bb8 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -235,7 +235,7 @@ object ScriptRunner { scriptArgs: List[String]): Boolean = { val pr = new PathResolver(settings) - val classpath = pr.asURLs :+ File(compiledLocation).toURL + val classpath = File(compiledLocation).toURL +: pr.asURLs try { ObjectRunner.run(classpath, scriptMain(settings), scriptArgs) |