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

Fixed dynamic task checking 

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@880 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-07-22 12:05:50 +00:00
parent e58cd74987
commit d0a9e63140
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/sbt/TaskManager.scala
View File

@ -45,8 +45,8 @@ trait TaskManager{
this(None, description, dependencies, interactive, action) this(None, description, dependencies, interactive, action)
checkTaskDependencies(dependencies) checkTaskDependencies(dependencies)
def manager: ManagerType = TaskManager.this def manager: ManagerType = TaskManager.this
def name = explicitName.getOrElse(implicitName) def name = explicitName.getOrElse(taskNameString(this))
private[sbt] def implicitName = taskNameString(this) private[sbt] def implicitName = taskName(this)
def named(name: String) = construct(Some(name), description,dependencies, interactive, action) def named(name: String) = construct(Some(name), description,dependencies, interactive, action)
override def toString = "Task " + name override def toString = "Task " + name
@ -87,7 +87,7 @@ trait TaskManager{
* Returns the task if it is valid.*/ * Returns the task if it is valid.*/
private def checkDynamic(task: Project#Task) = private def checkDynamic(task: Project#Task) =
{ {
for(t <- task.topologicalSort; staticName <- t.implicitName) for(t <- task.topologicalSort if !(t eq task); staticName <- t.implicitName)
error("Dynamic task " + task.name + " depends on static task " + staticName) error("Dynamic task " + task.name + " depends on static task " + staticName)
task task
} }