diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2007-01-04 10:23:38 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2007-01-04 10:23:38 +0000 |
| commit | fcec4e056e0455c10b4f868a112c6a0c1ba99c4d (patch) | |
| tree | de4c1e303b22fb3476482e5c6bdc4f35eaf76835 /src/compiler | |
| parent | d0193043d9421cac31aac611e0d659b3b32fc258 (diff) | |
| download | scala-fcec4e056e0455c10b4f868a112c6a0c1ba99c4d.tar.gz scala-fcec4e056e0455c10b4f868a112c6a0c1ba99c4d.tar.bz2 scala-fcec4e056e0455c10b4f868a112c6a0c1ba99c4d.zip | |
Commited wrong version of code for libdirs fix
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/MainGenericRunner.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala index 127b0bda3d..a91cdde18b 100644 --- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala +++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala @@ -75,12 +75,12 @@ object MainGenericRunner { } def paths(str: String) = str.split(File.pathSeparator).toList - def listJars(dirs: String): List[File] = + def listJars(dirs: String): List[String] = for ( - dir <- paths(dirs); libdir.exists; !libdir.isFile; - jar <- dir.listFiles; jar.isFile; jar.getName.endsWith(".jar") - ) yield jar - val classpath = + val libdir <- (paths(dirs) map { s => new File(s) }); libdir.exists; !libdir.isFile; + val jar <- libdir.listFiles; jar.isFile; jar.getName.endsWith(".jar") + ) yield jar.toString + val classpath: List[String] = paths(settings.bootclasspath.value) ::: paths(settings.classpath.value) ::: listJars(settings.extdirs.value) |