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

don't put Scala jars on forked boot classpath by default 

Ideally, Scala jars on the normal classpath would be moved to the boot classpath,
but this is more involved.
This commit is contained in:
Mark Harrah 2013-04-05 09:02:24 -04:00
parent 4630222aaa
commit 382b55402b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/scala/sbt/Defaults.scala
View File

@ -390,9 +390,10 @@ object Defaults extends BuildCommon
Seq(new Tests.Group("<default>", tests, if(fk) Tests.SubProcess(opts) else Tests.InProcess))
}
private[this] def forkOptions: Initialize[Task[ForkOptions]] =
(baseDirectory, scalaInstance, javaOptions, outputStrategy, envVars, javaHome, connectInput) map {
(base, si, options, strategy, env, javaHomeDir, connectIn) =>
ForkOptions(scalaJars = si.jars, javaHome = javaHomeDir, connectInput = connectIn, outputStrategy = strategy, runJVMOptions = options, workingDirectory = Some(base), envVars = env)
(baseDirectory, javaOptions, outputStrategy, envVars, javaHome, connectInput) map {
(base, options, strategy, env, javaHomeDir, connectIn) =>
// bootJars is empty by default because only jars on the user's classpath should be on the boot classpath
ForkOptions(bootJars = Nil, javaHome = javaHomeDir, connectInput = connectIn, outputStrategy = strategy, runJVMOptions = options, workingDirectory = Some(base), envVars = env)
}
def testExecutionTask(task: Scoped): Initialize[Task[Tests.Execution]] =