diff options
author | Paul Phillips <paulp@improving.org> | 2010-02-18 18:49:21 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-02-18 18:49:21 +0000 |
commit | 388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3 (patch) | |
tree | f1f5df26496c614446cea6b970f48c6659ad803d /src/compiler/scala/tools/nsc/ScriptRunner.scala | |
parent | 23e5428008fc88377e59a1a5c20d5476c586d62e (diff) | |
download | scala-388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3.tar.gz scala-388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3.tar.bz2 scala-388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3.zip |
The first reasonably satisfying classpath commit.
there with this one. Documentation to come. Review by community.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ScriptRunner.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index 5d5e4c8c43..0cd5fe1f6a 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -300,8 +300,8 @@ object ScriptRunner compiledLocation: String, scriptArgs: List[String]): Boolean = { - val classpath = - (PathResolver urlsFromSettings settings) ::: (PathResolver fromPathString compiledLocation asURLs) + val pr = new PathResolver(settings) + val classpath = pr.asURLs :+ new URL(compiledLocation) try { ObjectRunner.run( |