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

fix multi-project cross building

This commit is contained in:
Mark Harrah 2011-05-16 23:05:01 -04:00
parent 49e4b11e23
commit b4c29b20a1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/Cross.scala
View File

@ -6,7 +6,8 @@ package sbt
import Keys._
import complete.{DefaultParsers, Parser}
import DefaultParsers._
import Project.Setting
import Scope.GlobalScope
object Cross
{
@ -21,11 +22,14 @@ object Cross
lazy val switchVersion = Command.arb(requireSession(switchParser)) { case (state, (version, command)) =>
val x = Project.extract(state)
import x._
val add = (scalaVersion :== version) :: (scalaHome :== None) :: Nil
val append = Load.transformSettings(Load.projectScope(currentRef), currentRef.build, rootProject, add)
val newStructure = Load.reapply(session.original ++ append, structure)
println("Setting version to " + version)
val add = (scalaVersion in GlobalScope :== version) :: (scalaHome in GlobalScope :== None) :: Nil
val cleared = session.original.filterNot( crossExclude )
val newStructure = Load.reapply(add ++ cleared, structure)
Project.setProject(session, newStructure, command :: state)
}
def crossExclude(s: Setting[_]): Boolean =
s.key.key == scalaVersion.key || s.key.key == scalaHome.key
def crossParser(state: State): Parser[String] =
token(Cross ~ Space) flatMap { _ => token(matched(state.combinedParser)) }