diff options
| author | Paul Phillips <paulp@improving.org> | 2012-05-10 09:40:22 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-05-10 09:40:22 -0700 |
| commit | 782dad7619993d5f9ea358c41cd764ad0c692162 (patch) | |
| tree | 4740f6028376e375e13425f3a2d6235bc134f906 /src | |
| parent | 391524d99c5caaced0e1aacbb867ff15fca7e756 (diff) | |
| parent | 4bbbaa0240376c42ef6870f9321a99ae12448012 (diff) | |
| download | scala-782dad7619993d5f9ea358c41cd764ad0c692162.tar.gz scala-782dad7619993d5f9ea358c41cd764ad0c692162.tar.bz2 scala-782dad7619993d5f9ea358c41cd764ad0c692162.zip | |
Merge commit 'refs/pull/524/head'
Diffstat (limited to 'src')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/SBTRunner.scala | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/partest/scala/tools/partest/nest/SBTRunner.scala b/src/partest/scala/tools/partest/nest/SBTRunner.scala index 750e270c18..5d994eeb37 100644 --- a/src/partest/scala/tools/partest/nest/SBTRunner.scala +++ b/src/partest/scala/tools/partest/nest/SBTRunner.scala @@ -54,15 +54,17 @@ object SBTRunner extends DirectRunner { val config = parseArgs(args, CommandLineOptions()) fileManager.SCALAC_OPTS = config.scalacOptions fileManager.CLASSPATH = config.classpath getOrElse sys.error("No classpath set") + + def findClasspath(jar: String, name: String): Option[String] = { + val optJar = (fileManager.CLASSPATH split File.pathSeparator filter (_ matches (".*"+jar+".*\\.jar"))).headOption + val optClassDir = (fileManager.CLASSPATH split File.pathSeparator filter (_ matches (".*"+name+File.separator+"classes"))).headOption + optJar orElse optClassDir + } // Find scala library jar file... - val lib: Option[String] = (fileManager.CLASSPATH split File.pathSeparator filter (_ matches ".*scala-library.*\\.jar")).headOption - fileManager.LATEST_LIB = lib getOrElse sys.error("No scala-library found! Classpath = " + fileManager.CLASSPATH) - val comp: Option[String] = (fileManager.CLASSPATH split File.pathSeparator filter (_ matches ".*scala-compiler.*\\.jar")).headOption - fileManager.LATEST_COMP = comp getOrElse sys.error("No scala-compiler found! Classpath = " + fileManager.CLASSPATH) - val partest: Option[String] = (fileManager.CLASSPATH split File.pathSeparator filter (_ matches ".*scala-partest.*\\.jar")).headOption - fileManager.LATEST_PARTEST = partest getOrElse sys.error("No scala-partest found! Classpath = " + fileManager.CLASSPATH) - val actors: Option[String] = (fileManager.CLASSPATH split File.pathSeparator filter (_ matches ".*scala-actors.*\\.jar")).headOption - fileManager.LATEST_ACTORS = actors getOrElse sys.error("No scala-actors found! Classpath = " + fileManager.CLASSPATH) + fileManager.LATEST_LIB = findClasspath("scala-library", "scala-library") getOrElse sys.error("No scala-library found! Classpath = " + fileManager.CLASSPATH) + fileManager.LATEST_COMP = findClasspath("scala-compiler", "scala-compiler") getOrElse sys.error("No scala-compiler found! Classpath = " + fileManager.CLASSPATH) + fileManager.LATEST_PARTEST = findClasspath("scala-partest", "partest") getOrElse sys.error("No scala-partest found! Classpath = " + fileManager.CLASSPATH) + fileManager.LATEST_ACTORS = findClasspath("scala-actors", "actors") getOrElse sys.error("No scala-actors found! Classpath = " + fileManager.CLASSPATH) // TODO - Do something useful here!!! fileManager.JAVAC_CMD = "javac" |