erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Refactor.

Browse source
This commit is contained in:
Cedric Beust 2016-04-18 19:25:25 -08:00
parent 2401f66080
commit b6bd9e6c10
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
View file

@ -138,14 +138,15 @@ class TaskManager @Inject constructor(val args: Args,
DynamicGraph<T> { DynamicGraph<T> {
val result = DynamicGraph<T>() val result = DynamicGraph<T>()
taskNames.forEach { taskName -> taskNames.forEach { fullTaskName ->
val ti = TaskInfo(taskName) val ti = TaskInfo(fullTaskName)
if (!nodeMap.keys().contains(ti.taskName)) { if (!nodeMap.keys().contains(ti.taskName)) {
throw KobaltException("Unknown task: $taskName") throw KobaltException("Unknown task: $fullTaskName")
} }
if (ti.matches(projectName)) { if (ti.matches(projectName)) {
nodeMap[ti.taskName].forEach { task -> val taskName = ti.taskName
nodeMap[taskName].forEach { task ->
if (task != null && accept(task)) { if (task != null && accept(task)) {
val toProcess = arrayListOf(task) val toProcess = arrayListOf(task)
val seen = hashSetOf<String>() val seen = hashSetOf<String>()
@ -175,10 +176,10 @@ class TaskManager @Inject constructor(val args: Args,
} }
} }
} }
maybeAddEdge(ti.taskName, dependsOn, true, false) maybeAddEdge(taskName, dependsOn, true, false)
maybeAddEdge(ti.taskName, reverseDependsOn, true, true) maybeAddEdge(taskName, reverseDependsOn, true, true)
maybeAddEdge(ti.taskName, runBefore, false, false) maybeAddEdge(taskName, runBefore, false, false)
maybeAddEdge(ti.taskName, runAfter, false, false) maybeAddEdge(taskName, runAfter, false, false)
} }
toProcess.clear() toProcess.clear()
toProcess.addAll(newToProcess) toProcess.addAll(newToProcess)
@ -187,7 +188,7 @@ class TaskManager @Inject constructor(val args: Args,
} }
} }
} else { } else {
log(3, "Task $taskName does not match the current project $projectName, skipping it") log(3, "Task $fullTaskName does not match the current project $projectName, skipping it")
} }
} }
return result return result