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

Add support for wrapAfter().

Browse source
This commit is contained in:
Cedric Beust 2015-10-09 20:53:47 -07:00
parent f32bfb8c80
commit 81b1d63520
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
View file

@ -70,10 +70,13 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
if (ti.matches(projectName)) { if (ti.matches(projectName)) {
val task = tasksByNames.get(ti.task) val task = tasksByNames.get(ti.task)
if (task != null && task.plugin.accept(project)) { if (task != null && task.plugin.accept(project)) {
val allTasks = arrayListOf<PluginTask>()
// //
// Add free tasks as nodes to the graph // Add free tasks as nodes to the graph
// //
calculateFreeTasks(tasksByNames).forEach { val freeTasks = calculateFreeTasks(tasksByNames)
allTasks.addAll(freeTasks)
freeTasks.forEach {
val thisTaskInfo = TaskInfo(projectName, it.name) val thisTaskInfo = TaskInfo(projectName, it.name)
if (! tasksAlreadyRun.contains(thisTaskInfo.id)) { if (! tasksAlreadyRun.contains(thisTaskInfo.id)) {
graph.addNode(it) graph.addNode(it)
@ -84,7 +87,9 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
// //
// Add the transitive closure of the current task as edges to the graph // Add the transitive closure of the current task as edges to the graph
// //
calculateTransitiveClosure(project, tasksByNames, ti, task).forEach { pluginTask -> val transitiveClosure = calculateTransitiveClosure(project, tasksByNames, ti, task)
allTasks.addAll(transitiveClosure)
transitiveClosure.forEach { pluginTask ->
val rb = runBefore.get(pluginTask.name) val rb = runBefore.get(pluginTask.name)
rb.forEach { rb.forEach {
val to = tasksByNames.get(it) val to = tasksByNames.get(it)
@ -99,6 +104,20 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
} }
} }
} }
//
// Now that we have free and non-free nodes in the graph, see if any of them
// has a wrapAfter task and if they do, add the corresponding edge to the graph
//
allTasks.forEach {
val after = wrapAfter.get(it.name)
after.forEach { af ->
val afterTask = tasksByNames.get(af)
if (afterTask != null) {
graph.addEdge(afterTask, it)
}
}
}
} }
// //
@ -157,14 +176,6 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg
log(3, "toProcess size: " + toProcess.size()) log(3, "toProcess size: " + toProcess.size())
toProcess.forEach { target -> toProcess.forEach { target ->
wrapAfter.get(ti.id).let {
val tasks = tasksByNames.get(it)
if (tasks != null) {
tasks.forEach {
newToProcess.add(TaskInfo(project.name!!, task!!.name))
}
}
val currentTask = TaskInfo(project.name!!, target.task) val currentTask = TaskInfo(project.name!!, target.task)
transitiveClosure.add(tasksByNames.get(currentTask.task)!!) transitiveClosure.add(tasksByNames.get(currentTask.task)!!)
val task = tasksByNames.get(target.task) val task = tasksByNames.get(target.task)