azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: use UtilityJavaExec task to serialize builtins

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-11-30 19:06:07 +03:00
parent 35c2de08b0
commit da46164896
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/builtins/build.gradle.kts
+5 -12
View File
@@ -18,23 +18,16 @@ val clean by tasks.getting {
} }
} }
val JDK_18: String = rootProject.extra["JDK_18"] as String val serialize by tasks.creating(UtilityJavaExec::class) {
// We avoid using JavaExec task here due to IDEA-200192:
// IDEA attaches debugger to all JavaExec tasks making our breakpoints trigger during irrelevant task execution
val serialize by tasks.creating(Exec::class) {
val outDir = builtinsSerialized val outDir = builtinsSerialized
val inDirs = arrayOf(builtinsSrc, builtinsNative) val inDirs = arrayOf(builtinsSrc, builtinsNative)
inDirs.forEach { inputs.dir(it) } inDirs.forEach { inputs.dir(it) }
outputs.dir(outDir) outputs.dir(outDir)
commandLine( classpath(rootProject.buildscript.configurations["bootstrapCompilerClasspath"])
"$JDK_18/bin/java", main = "org.jetbrains.kotlin.serialization.builtins.RunKt"
"-Didea.io.use.nio2=true", jvmArgs("-Didea.io.use.nio2=true")
"-cp", rootProject.buildscript.configurations["bootstrapCompilerClasspath"].asPath, args(outDir, *inDirs)
"org.jetbrains.kotlin.serialization.builtins.RunKt",
outDir, *inDirs
)
} }
val builtinsJar by task<Jar> { val builtinsJar by task<Jar> {