diff options
| author | Paul Phillips <paulp@improving.org> | 2010-02-22 00:15:32 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-02-22 00:15:32 +0000 |
| commit | 91cdb1531656d9240e9ee64509ab528d727d1b51 (patch) | |
| tree | a33bbdb66b0ee1bb147bb8628902f66bc7f66756 /src/compiler/scala/tools/util | |
| parent | f07bdbab911a7bcef042373d45fab302753f5a1f (diff) | |
| download | scala-91cdb1531656d9240e9ee64509ab528d727d1b51.tar.gz scala-91cdb1531656d9240e9ee64509ab528d727d1b51.tar.bz2 scala-91cdb1531656d9240e9ee64509ab528d727d1b51.zip | |
More laboring on Settings, ClassPaths, Ant Task...
More laboring on Settings, ClassPaths, Ant Tasks, Partest, and similar
epicenters of thrilldom. No review.
Diffstat (limited to 'src/compiler/scala/tools/util')
| -rw-r--r-- | src/compiler/scala/tools/util/ClassPathSettings.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/util/ClassPathSettings.scala b/src/compiler/scala/tools/util/ClassPathSettings.scala index 49c01d19df..bb838f1e66 100644 --- a/src/compiler/scala/tools/util/ClassPathSettings.scala +++ b/src/compiler/scala/tools/util/ClassPathSettings.scala @@ -16,8 +16,6 @@ trait ClassPathSettings { def extdirs: String // -extdirs def classpath: String // -classpath def sourcepath: String // -sourcepath - - def codebase: String // -Ycodebase } // val debugLogger = { diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index 03a7043521..1a7c121d56 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -23,8 +23,8 @@ object PathResolver { private def fileOpt(f: Path): Option[String] = f ifFile (_.path) private def dirOpt(d: Path): Option[String] = d ifDirectory (_.path) - private def expandToPath(p: Path) = join(ClassPath.expandPath(p.path, true)) - private def expandToContents(p: Path) = join(ClassPath.expandDir(p.path)) + private def expandToPath(p: Path) = join(ClassPath.expandPath(p.path, true): _*) + private def expandToContents(p: Path) = join(ClassPath.expandDir(p.path): _*) /** Map all classpath elements to absolute paths and reconstruct the classpath. */ @@ -106,13 +106,13 @@ object PathResolver { else "" def scalaBootClassPath = scalaLibDirFound match { - case Some(dir) if scalaHomeExists => join(ClassPath expandDir dir.path) + case Some(dir) if scalaHomeExists => join(ClassPath expandDir dir.path: _*) case _ => "" } def scalaExtDirs = Environment.scalaExtDirs def scalaPluginDirs = List("misc", "scala-devel", "plugins") - def scalaPluginPath = join(scalaPluginDirs map (scalaHomeDir / _ path)) + def scalaPluginPath = join(scalaPluginDirs map (scalaHomeDir / _ path): _*) override def toString = """ |object Defaults { @@ -173,7 +173,6 @@ class PathResolver(settings: Settings, context: JavaContext) { case "extdirs" => settings.extdirs.value case "classpath" | "cp" => settings.classpath.value case "sourcepath" => settings.sourcepath.value - case "Ycodebase" => settings.Ycodebase.value } /** Calculated values based on any given command line options, falling back on @@ -188,7 +187,6 @@ class PathResolver(settings: Settings, context: JavaContext) { def scalaExtDirs = cmdLineOrElse("extdirs", Defaults.scalaExtDirs) def userClassPath = cmdLineOrElse("classpath", ".") def sourcePath = cmdLineOrElse("sourcepath", "") - def codeBase = cmdLineOrElse("Ycodebase", "") import context._ |