diff options
| author | Paul Phillips <paulp@improving.org> | 2010-02-19 21:43:35 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-02-19 21:43:35 +0000 |
| commit | cabe5170506e843e3400a7d761f5e7e0b19ae3a1 (patch) | |
| tree | 5c5aab445db7e4bc65139894d57efa84003a42e2 /src/compiler/scala/tools/nsc/ScriptRunner.scala | |
| parent | dd89e9c089c33874e321573b061e9a7317848d42 (diff) | |
| download | scala-cabe5170506e843e3400a7d761f5e7e0b19ae3a1.tar.gz scala-cabe5170506e843e3400a7d761f5e7e0b19ae3a1.tar.bz2 scala-cabe5170506e843e3400a7d761f5e7e0b19ae3a1.zip | |
Some script fixes tied up with classpaths.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ScriptRunner.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index 0cd5fe1f6a..b8629279c2 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -195,16 +195,7 @@ object ScriptRunner settings: GenericRunnerSettings, scriptFileIn: String): Boolean = { - val scriptFile = Path(scriptFileIn).toAbsolute.path - - { - import settings._ - for (setting <- List(classpath, sourcepath, bootclasspath, extdirs, outdir)) { - // DBG("%s = %s".format(setting.name, setting.value)) - setting.value = PathResolver.makeAbsolute(setting.value) - } - } - + val scriptFile = Path(scriptFileIn).toAbsolute.path val compSettingNames = new Settings(error).settingSet.toList map (_.name) val compSettings = settings.settingSet.toList filter (compSettingNames contains _.name) val coreCompArgs = compSettings flatMap (_.unparse) @@ -301,7 +292,7 @@ object ScriptRunner scriptArgs: List[String]): Boolean = { val pr = new PathResolver(settings) - val classpath = pr.asURLs :+ new URL(compiledLocation) + val classpath = pr.asURLs :+ File(compiledLocation).toURL try { ObjectRunner.run( |