From 9a914bea4bde66487b7e079f5bb7c36cc1817a0a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 25 May 2011 22:44:22 -0400 Subject: [PATCH] minor improvements to running tasks from console-project --- main/Project.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main/Project.scala b/main/Project.scala index 45762fb3b..aa2ae0514 100644 --- a/main/Project.scala +++ b/main/Project.scala @@ -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 getOrError(scope, key.key) } - def runTask[T](key: ScopedTask[T], state: State): T = + def evalTask[T](key: ScopedTask[T], state: State): T = { 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 result = getOrError(key.scope, key.key, value) + val result = getOrError(rkey.scope, rkey.key, value) processResult(result, ConsoleLogger()) } private def getOrError[T](scope: Scope, key: AttributeKey[_], value: Option[T]): T =