Drop module "ktm" scripts and support java source roots in "xml" modules

Drop kotlin.modules package from runtime
Move adapted classes into compiler
Unsupport files with "ktm" extension
Delete code for loading module scripts
Drop tests for module scripts
Separate section for java source roots in xml script generator/parser
This commit is contained in:
Pavel V. Talanov
2015-04-02 21:35:13 +03:00
parent 09947d8f58
commit 94cc847c48
20 changed files with 109 additions and 294 deletions
@@ -1,7 +0,0 @@
package kotlin.modules
import java.util.ArrayList
public object AllModules : ThreadLocal<ArrayList<Module>>() {
override fun initialValue() = ArrayList<Module>()
}
@@ -1,13 +0,0 @@
package kotlin.modules
public trait Module {
public fun getModuleName(): String
public fun getOutputDirectory(): String
public fun getSourceFiles(): List<String>
public fun getClasspathRoots(): List<String>
public fun getAnnotationsRoots(): List<String>
}
@@ -1,62 +0,0 @@
package kotlin.modules
import java.util.ArrayList
public fun module(name: String, outputDir: String, callback: ModuleBuilder.() -> Unit) {
val builder = ModuleBuilder(name, outputDir)
builder.callback()
AllModules.get()?.add(builder)
}
public class SourcesBuilder(private val parent: ModuleBuilder) {
public fun plusAssign(pattern: String) {
parent.addSourceFiles(pattern)
}
}
public class ClasspathBuilder(private val parent: ModuleBuilder) {
public fun plusAssign(name: String) {
parent.addClasspathEntry(name)
}
}
public class AnnotationsPathBuilder(private val parent: ModuleBuilder) {
public fun plusAssign(name: String) {
parent.addAnnotationsPathEntry(name)
}
}
public open class ModuleBuilder(private val name: String, private val outputDir: String) : Module {
// http://youtrack.jetbrains.net/issue/KT-904
private val sourceFiles0 = ArrayList<String>()
private val classpathRoots0 = ArrayList<String>()
private val annotationsRoots0 = ArrayList<String>()
public val sources: SourcesBuilder
get() = SourcesBuilder(this)
public val classpath: ClasspathBuilder
get() = ClasspathBuilder(this)
public val annotationsPath: AnnotationsPathBuilder
get() = AnnotationsPathBuilder(this)
public fun addSourceFiles(pattern: String) {
sourceFiles0.add(pattern)
}
public fun addClasspathEntry(name: String) {
classpathRoots0.add(name)
}
public fun addAnnotationsPathEntry(name: String) {
annotationsRoots0.add(name)
}
public override fun getOutputDirectory(): String = outputDir
public override fun getSourceFiles(): List<String> = sourceFiles0
public override fun getClasspathRoots(): List<String> = classpathRoots0
public override fun getAnnotationsRoots(): List<String> = annotationsRoots0
public override fun getModuleName(): String = name
}