[build] joint (step 2)

- dist:
  - compiler
  - tools(cinterop,klib)
  - stdlib
  - cache
This commit is contained in:
Vasily Levchenko
2020-11-16 16:40:45 +01:00
parent c85c3ac123
commit 840c1e612c
14 changed files with 112 additions and 61 deletions
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.gradle.plugin.konan
import org.gradle.api.Named
import org.gradle.api.Project
import org.gradle.api.file.FileCollection
import org.gradle.api.Action
import org.gradle.process.JavaExecSpec
import org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin.ProjectProperty.KONAN_HOME
import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.kotlin.konan.target.HostManager
@@ -91,21 +93,23 @@ internal abstract class KonanCliRunner(
"Please change it to the compiler root directory and rerun the build.")
}
project.javaexec {
main = this@KonanCliRunner.mainClass
classpath = classpath
jvmArgs(jvmArgs)
systemProperties(
System.getProperties().asSequence()
.map { (k, v) -> k.toString() to v.toString() }
.filter { (k, _) -> k !in blacklistProperties }
.escapeQuotesForWindows()
.toMap()
)
args(listOf(toolName) + transformArgs(args))
blacklistEnvironment.forEach { environment.remove(it) }
environment(environment)
}
project.javaexec(object :Action<JavaExecSpec> {
override fun execute(exec: JavaExecSpec) {
exec.main = mainClass
exec.classpath = classpath
exec.jvmArgs(jvmArgs)
exec.systemProperties(
System.getProperties().asSequence()
.map { (k, v) -> k.toString() to v.toString() }
.filter { (k, _) -> k !in this@KonanCliRunner.blacklistProperties }
.escapeQuotesForWindows()
.toMap()
)
exec.args(listOf(toolName) + transformArgs(args))
this@KonanCliRunner.blacklistEnvironment.forEach { environment.remove(it) }
exec.environment(environment)
}
})
}
}