diff options
author | Paul Phillips <paulp@improving.org> | 2011-05-12 05:34:37 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-05-12 05:34:37 +0000 |
commit | 2bd6b4ae4010b3c65cb36d876c2ca94cb6d48b14 (patch) | |
tree | 1081485986e10418ddcee70b977625743f210ff4 /src/compiler/scala/tools/util/PathResolver.scala | |
parent | 4869a2b28438b2175d615a55691cc202f10d0191 (diff) | |
download | scala-2bd6b4ae4010b3c65cb36d876c2ca94cb6d48b14.tar.gz scala-2bd6b4ae4010b3c65cb36d876c2ca94cb6d48b14.tar.bz2 scala-2bd6b4ae4010b3c65cb36d876c2ca94cb6d48b14.zip |
Fairly ruthlessly optimized ZipArchive.
results from the profiler, but it sure isn't slower and it shed 125
lines or so. No review.
Diffstat (limited to 'src/compiler/scala/tools/util/PathResolver.scala')
-rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index 1420499e91..1055bfdef2 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -105,10 +105,18 @@ object PathResolver { else if (scalaLibAsDir.isDirectory) scalaLibAsDir.path else "" - def scalaBootClassPath = scalaLibDirFound match { - case Some(dir) if scalaHomeExists => join(ClassPath expandDir dir.path: _*) - case _ => "" - } + // XXX It must be time for someone to figure out what all these things + // are intended to do. This is disabled here because it was causing all + // the scala jars to end up on the classpath twice: one on the boot + // classpath as set up by the runner (or regular classpath under -nobootcp) + // and then again here. + def scalaBootClassPath = "" + // scalaLibDirFound match { + // case Some(dir) if scalaHomeExists => + // val paths = ClassPath expandDir dir.path + // join(paths: _*) + // case _ => "" + // } def scalaExtDirs = Environment.scalaExtDirs |