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

clear scala-home during cross-building

This commit is contained in:
Mark Harrah 2011-05-02 19:35:42 -04:00
parent b2c9e87906
commit ef20db1aa9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Cross.scala
View File

@ -21,7 +21,7 @@ object Cross
lazy val switchVersion = Command.arb(requireSession(switchParser)) { case (state, (version, command)) => lazy val switchVersion = Command.arb(requireSession(switchParser)) { case (state, (version, command)) =>
val x = Project.extract(state) val x = Project.extract(state)
import x._ import x._
val add = (scalaVersion := version) :: Nil val add = (scalaVersion :== version) :: (scalaHome :== None) :: Nil
val append = Load.transformSettings(Load.projectScope(currentRef), currentRef.build, rootProject, add) val append = Load.transformSettings(Load.projectScope(currentRef), currentRef.build, rootProject, add)
val newStructure = Load.reapply(session.original ++ append, structure) val newStructure = Load.reapply(session.original ++ append, structure)
Project.setProject(session, newStructure, command :: state) Project.setProject(session, newStructure, command :: state)

2
project/build/XSbt.scala
View File

@ -302,7 +302,7 @@ class XSbt(info: ProjectInfo) extends ParentProject(info) with NoCrossPaths
// sub projects for each version of Scala to precompile against other than the one sbt is built against // sub projects for each version of Scala to precompile against other than the one sbt is built against
// each sub project here will add ~100k to the download // each sub project here will add ~100k to the download
lazy val precompiled29 = precompiledSub("2.9.0.RC1") lazy val precompiled29 = precompiledSub("2.9.0.RC2")
lazy val precompiled28 = precompiledSub("2.8.0") lazy val precompiled28 = precompiledSub("2.8.0")
lazy val precompiled27 = precompiledSub("2.7.7") lazy val precompiled27 = precompiledSub("2.7.7")