From d0193043d9421cac31aac611e0d659b3b32fc258 Mon Sep 17 00:00:00 2001 From: Gilles Dubochet Date: Wed, 3 Jan 2007 17:22:09 +0000 Subject: 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). --- src/compiler/scala/tools/nsc/MainGenericRunner.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') 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 => -- cgit v1.2.3