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

Task ordering fix.

Browse source
This commit is contained in:
Cedric Beust 2016-08-11 19:23:20 -07:00
parent 906e4aa60f
commit 6d9ec2c9ec
1 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,20 @@ abstract class BaseProjectRunner {
accept: (T) -> Boolean): accept: (T) -> Boolean):
DynamicGraph<T> { DynamicGraph<T> {
/**
* Add an edge from @param from to all its tasks.
*/
fun addEdge(result: DynamicGraph<T>, from: String, to: String, newToProcess: ArrayList<T>, text: String) {
val froms = nodeMap[from]
froms.forEach { f: T ->
nodeMap[to].forEach { t: T ->
kobaltLog(TAG, " Adding edge ($text) $f -> $t")
result.addEdge(f, t)
newToProcess.add(t)
}
}
}
val result = DynamicGraph<T>() val result = DynamicGraph<T>()
val newToProcess = arrayListOf<T>() val newToProcess = arrayListOf<T>()
val seen = hashSetOf<String>() val seen = hashSetOf<String>()
@ -79,20 +93,6 @@ abstract class BaseProjectRunner {
while (toProcess.size > 0) { while (toProcess.size > 0) {
/**
* Add an edge from @param from to all its tasks.
*/
fun addEdge(result: DynamicGraph<T>, from: String, to: String, newToProcess: ArrayList<T>, text: String) {
val froms = nodeMap[from]
froms.forEach { f: T ->
nodeMap[to].forEach { t: T ->
kobaltLog(TAG, " Adding edge ($text) $f -> $t")
result.addEdge(f, t)
newToProcess.add(t)
}
}
}
/** /**
* Whenever a task is added to the graph, we also add its alwaysRunAfter tasks. * Whenever a task is added to the graph, we also add its alwaysRunAfter tasks.
*/ */
@ -144,32 +144,35 @@ abstract class BaseProjectRunner {
addEdge(result, taskName, to, newToProcess, "dependsOn") addEdge(result, taskName, to, newToProcess, "dependsOn")
} }
//
// runBefore and runAfter (task ordering) are only considered for explicit tasks (tasks that were
// explicitly requested by the user)
//
val passedTaskNames = passedTasks.map { it.taskName }.toSet()
passedTaskNames.let { taskNames ->
runBefore[taskName].forEach { from ->
if (passedTaskNames.contains(from)) {
addEdge(result, from, taskName, newToProcess, "runBefore")
}
}
runAfter[taskName].forEach { to ->
if (passedTaskNames.contains(to)) {
addEdge(result, to, taskName, newToProcess, "runAfter")
}
}
}
seen.add(taskName) seen.add(taskName)
} }
newToProcess.forEach { processAlways(always, it) } newToProcess.forEach { processAlways(always, it) }
toProcess.clear() toProcess.clear()
toProcess.addAll(newToProcess.filter { !seen.contains(toName(it)) }.map { TaskManager.TaskInfo(toName(it)) }) toProcess.addAll(
newToProcess
.filter { !seen.contains(toName(it)) }
.map { TaskManager.TaskInfo(toName(it)) })
newToProcess.clear() newToProcess.clear()
} }
//
// Now that we have all the tasks tnat need to run, process runBefore/runAfter, which
// are not allowed to add new tasks. Therefore, we only add edges to the graph if both
// the from and the to are already present.
//
val finalTaskNames = result.nodes.map { TaskManager.TaskInfo(it.toString()).taskName }
finalTaskNames.forEach { taskName ->
runBefore[taskName].filter { finalTaskNames.contains(it) }.forEach { from ->
addEdge(result, from, taskName, newToProcess, "runBefore")
}
runAfter[taskName].filter { finalTaskNames.contains(it) }.forEach { to ->
addEdge(result, to, taskName, newToProcess, "runAfter")
}
}
return result return result
} }
} }