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

Enabling parallel builds in JPS without daemon, enabling application environment disposing in tests, introducing keepalive property constant

Browse Source 
Original commit: 10036d7ef3
This commit is contained in:
Ilya Chernikov
2015-10-30 15:58:28 +01:00
parent 5fe43b4e72
commit 1f62b03f13
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class CompilerRunnerUtil {
}
@Nullable
public synchronized static Object invokeExecMethod(
public static Object invokeExecMethod(
@NotNull String compilerClassName,
@NotNull String[] arguments,
@NotNull CompilerEnvironment environment,
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt
+5 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.compilerRunner
import com.intellij.util.xmlb.XmlSerializerUtil
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
@@ -111,6 +112,9 @@ public object KotlinCompilerRunner {
val stream = ByteArrayOutputStream()
val out = PrintStream(stream)
if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null)
System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "")
val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out)
// exec() returns an ExitCode object, class of which is loaded with a different class loader,
@@ -139,7 +143,7 @@ public object KotlinCompilerRunner {
// 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")
daemonJVMOptions.jvmParams.add("D$KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY")
val daemonReportMessages = ArrayList<DaemonReportMessage>()