From 376c188cf7c1ba0a1ea3787a14cef875d741b82a Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 19 Oct 2015 15:10:54 +0200 Subject: [PATCH] Setting property that controls application environment lifetime for daemon builds --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 50e752af3b6..19897e05a6c 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -136,6 +136,10 @@ public object KotlinCompilerRunner { val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) val daemonOptions = configureDaemonOptions() val daemonJVMOptions = configureDaemonJVMOptions(true) + // the property should be set by default for daemon builds to avoid parallel building problems + // but it cannot be currently set by default globally, because it seems breaks many tests + // TODO: find out how to get rid of the property and make it the default behavior + daemonJVMOptions.jvmParams.add("Dkotlin.environment.keepalive") val daemonReportMessages = ArrayList()