From cc7564d9f7caa88366233d7351ed68e36b6c4b6b Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 19 May 2016 05:58:59 -0800 Subject: [PATCH] Dead code. --- .../com/beust/kobalt/internal/TaskManager.kt | 132 ------------------ .../kotlin/com/beust/kobalt/misc/KFiles.kt | 3 - 2 files changed, 135 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt index 416c37d8..d01f2e47 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt @@ -284,138 +284,6 @@ class TaskManager @Inject constructor(val args: Args, return result } -// private fun reverseMultimap(mm: Multimap) : Multimap { -// val result = TreeMultimap.create() -// mm.keySet().forEach { key -> -// mm[key].forEach { value -> -// result.put(value, key) -// } -// } -// return result -// } - - /** - * Create a dynamic graph representing all the tasks that need to be run. - */ -// @VisibleForTesting -// fun createGraph(projectName: String, taskNames: List, nodeMap: Multimap, -// dependsOn: Multimap, -// reverseDependsOn: Multimap, -// runBefore: Multimap, -// runAfter: Multimap, -// toName: (T) -> String, -// accept: (T) -> Boolean): -// DynamicGraph { -// -// val result = DynamicGraph() -// taskNames.forEach { fullTaskName -> -// val ti = TaskInfo(fullTaskName) -// if (!nodeMap.keys().contains(ti.taskName)) { -// throw KobaltException("Unknown task: $fullTaskName") -// } -// -// if (ti.matches(projectName)) { -// val tiTaskName = ti.taskName -// nodeMap[tiTaskName].forEach { task -> -// if (task != null && accept(task)) { -// val toProcess = arrayListOf(task) -// val newToProcess = hashSetOf() -// -// fun maybeAddEdge(task: T, mm: Multimap, -// seen: Set, -// isDependency: Boolean, -// reverseEdges: Boolean = false): Boolean { -// var added = false -// val taskName = toName(task) -// mm[taskName]?.forEach { toName -> -// val addEdge = isDependency || (!isDependency && taskNames.contains(toName)) -// if (addEdge) { -// nodeMap[toName].forEach { to -> -// if (reverseEdges) { -// log(3, " Adding reverse edge \"$to\" -> \"$task\" it=\"$toName\"") -// added = true -// result.addEdge(to, task) -// } else { -// log(3, " Adding edge \"$task\" -> \"$to\"") -// added = true -// result.addEdge(task, to) -// } -// if (!seen.contains(toName(to))) { -// log(3, " New node to process: \"$to\"") -// newToProcess.add(to) -// } else { -// log(3, " Already seen: $to") -// } -// } -// } -// } -// return added -// } -// -// // These two maps indicate reversed dependencies so we want to have -// // a reverse map for them so we consider all the cases. For example, -// // if we are looking at task "a", we want to find all the relationships -// // that depend on "a" and also all the relationships that "a" depends on -// val invertedReverseDependsOn = reverseMultimap(reverseDependsOn) -// val invertedRunBefore = reverseMultimap(runBefore) -// val invertedDependsOn = reverseMultimap(dependsOn) -// val invertedRunAfter = reverseMultimap(runAfter) -// -// val seen = hashSetOf() -// while (toProcess.size > 0) { -// log(3, " New batch of nodes to process: $toProcess") -// toProcess.filter { !seen.contains(toName(it)) }.forEach { current -> -// result.addNode(current) -// -// if (! maybeAddEdge(current, invertedDependsOn, seen, true, true)) { -// maybeAddEdge(current, dependsOn, seen, true, false) -// } -// if (! maybeAddEdge(current, invertedRunAfter, seen, false, true)) { -// maybeAddEdge(current, runAfter, seen, false, false) -// } -// if (! maybeAddEdge(current, reverseDependsOn, seen, true, true)) { -// maybeAddEdge(current, invertedReverseDependsOn, seen, true, false) -// } -// if (! maybeAddEdge(current, runBefore, seen, false, true)) { -// maybeAddEdge(current, invertedRunBefore, seen, false, false) -// } -// -// seen.add(toName(current)) -// -// newToProcess.addAll(dependsOn[toName(current)].flatMap { nodeMap[it] }) -// } -// toProcess.clear() -// toProcess.addAll(newToProcess) -// newToProcess.clear() -// } -// } -// } -// } else { -// log(3, "Task $fullTaskName does not match the current project $projectName, skipping it") -// } -// } -// return result -// } - - /** - * Find the free tasks of the graph. - */ -// private fun calculateFreeTasks(tasksByNames: Multimap, runBefore: TreeMultimap, -// reverseAfter: HashMap) -// : Collection { -// val freeTaskMap = hashMapOf() -// tasksByNames.keys().forEach { -// if (! runBefore.containsKey(it) && ! reverseAfter.containsKey(it)) { -// tasksByNames[it].forEach { t -> -// freeTaskMap.put(it, t) -// } -// } -// } -// -// return freeTaskMap.values -// } - ///// // Manage the tasks // diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt index 71e16358..58f07332 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt @@ -65,9 +65,6 @@ class KFiles { val TEST_CLASSES_DIR : String = "test-classes" - private fun generatedDir(project: Project, variant: Variant) - = KFiles.joinDir(project.directory, project.buildDirectory, "generated", variant.toIntermediateDir()) - fun generatedSourceDir(project: Project, variant: Variant, name: String) = KFiles.joinDir(project.directory, project.buildDirectory, "generated", "source", name, variant.toIntermediateDir())