luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Mark Harrah 2011-03-11 16:52:12 -05:00
parent 77092b7888
commit b996a95157
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
run/Run.scala
View File

@ -18,10 +18,8 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun
def run(mainClass: String, classpath: Seq[File], options: Seq[String], log: Logger): Option[String] =
{
val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList
val exitCode = config.outputStrategy match {
case Some(strategy) => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, strategy)
case None => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, LoggedOutput(log))
}
val strategy = config.outputStrategy getOrElse LoggedOutput(log)
val exitCode = Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, strategy)
processExitCode(exitCode, "runner")
}
private def classpathOption(classpath: Seq[File]) = "-cp" :: Path.makeString(classpath) :: Nil