Fix bootstrap

This commit is contained in:
Ilmir Usmanov
2018-09-27 16:00:54 +03:00
parent 6e0391f9ec
commit e7bed58ebe
+7 -9
View File
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
import java.io.File import java.io.File
@@ -10,17 +8,17 @@ val builtinsSerialized = File(rootProject.extra["distDir"].toString(), "builtins
val builtins by configurations.creating val builtins by configurations.creating
val serialize = task("serialize") { val serialize = task<Exec>("serialize") {
val outDir = builtinsSerialized val outDir = builtinsSerialized
val inDirs = arrayOf(builtinsSrc, builtinsNative) val inDirs = arrayOf(builtinsSrc, builtinsNative)
outputs.dir(outDir) outputs.dir(outDir)
inputs.files(*inDirs) inputs.files(*inDirs)
doLast { commandLine(
BuiltInsSerializer(dependOnOldBuiltIns = false) "java", "-cp",
.serialize(outDir, inDirs.asList(), listOf()) { totalSize, totalFiles -> rootProject.buildscript.configurations["bootstrapCompilerClasspath"].asPath,
println("Total bytes written: $totalSize to $totalFiles files") "org.jetbrains.kotlin.serialization.builtins.RunKt",
} "$outDir", *inDirs
} )
} }
val builtinsJar by task<Jar> { val builtinsJar by task<Jar> {