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

minor improvements to running tasks from console-project

This commit is contained in:
Mark Harrah 2011-05-25 22:44:22 -04:00
parent 85a55c25bf
commit 9a914bea4b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/Project.scala
View File

@ -69,11 +69,13 @@ final case class Extracted(structure: BuildStructure, session: SessionSettings,
val scope = if(key.scope.project == This) key.scope.copy(project = Select(currentRef)) else key.scope val scope = if(key.scope.project == This) key.scope.copy(project = Select(currentRef)) else key.scope
getOrError(scope, key.key) getOrError(scope, key.key)
} }
def runTask[T](key: ScopedTask[T], state: State): T = def evalTask[T](key: ScopedTask[T], state: State): T =
{ {
import EvaluateTask._ import EvaluateTask._
val extracted = Project.extract(state)
val rkey = Project.mapScope(Scope.resolveScope(GlobalScope, extracted.currentRef.build, rootProject) )( key )
val value: Option[Result[T]] = evaluateTask(structure, key.task.scoped, state, currentRef) val value: Option[Result[T]] = evaluateTask(structure, key.task.scoped, state, currentRef)
val result = getOrError(key.scope, key.key, value) val result = getOrError(rkey.scope, rkey.key, value)
processResult(result, ConsoleLogger()) processResult(result, ConsoleLogger())
} }
private def getOrError[T](scope: Scope, key: AttributeKey[_], value: Option[T]): T = private def getOrError[T](scope: Scope, key: AttributeKey[_], value: Option[T]): T =