diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2007-01-03 17:22:09 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2007-01-03 17:22:09 +0000 |
| commit | d0193043d9421cac31aac611e0d659b3b32fc258 (patch) | |
| tree | e8df83997f3d23bc69d71295bb3f5ff028223ca0 /src/compiler | |
| parent | 344ba095e17d1cf5ae8c3e82c6409008b3e4f7f2 (diff) | |
| download | scala-d0193043d9421cac31aac611e0d659b3b32fc258.tar.gz scala-d0193043d9421cac31aac611e0d659b3b32fc258.tar.bz2 scala-d0193043d9421cac31aac611e0d659b3b32fc258.zip | |
MainGenericRunner program now deals properly wi...
MainGenericRunner program now deals properly with the extdirs property
(adds all *.jar archives from the folders defined in extdirs to the
classpath).
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/MainGenericRunner.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala index 056113d63a..127b0bda3d 100644 --- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala +++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala @@ -75,11 +75,15 @@ object MainGenericRunner { } def paths(str: String) = str.split(File.pathSeparator).toList - + def listJars(dirs: String): List[File] = + for ( + dir <- paths(dirs); libdir.exists; !libdir.isFile; + jar <- dir.listFiles; jar.isFile; jar.getName.endsWith(".jar") + ) yield jar val classpath = paths(settings.bootclasspath.value) ::: - paths(settings.classpath.value) - + paths(settings.classpath.value) ::: + listJars(settings.extdirs.value) command.thingToRun match { case None => |