mirror of https://github.com/sbt/sbt.git
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:
parent
e58cd74987
commit
d0a9e63140
|
|
@ -45,8 +45,8 @@ trait TaskManager{
|
|||
this(None, description, dependencies, interactive, action)
|
||||
checkTaskDependencies(dependencies)
|
||||
def manager: ManagerType = TaskManager.this
|
||||
def name = explicitName.getOrElse(implicitName)
|
||||
private[sbt] def implicitName = taskNameString(this)
|
||||
def name = explicitName.getOrElse(taskNameString(this))
|
||||
private[sbt] def implicitName = taskName(this)
|
||||
def named(name: String) = construct(Some(name), description,dependencies, interactive, action)
|
||||
override def toString = "Task " + name
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ trait TaskManager{
|
|||
* Returns the task if it is valid.*/
|
||||
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)
|
||||
task
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue