adding java startup parameters for headless appearance of the daemon on mac, prepared a function for resetting alive flag in kotlin plugin startup component as a temporary solution to stop daemon from idea, fixing code that disable incremental compilation, that was broken on the last modification of KotlinBuildProcessParametersProvider

2015-09-10 14:43:34 +02:00
parent dc3c1beeb9
commit 473ff00940
3 changed files with 21 additions and 9 deletions
@@ -276,8 +276,10 @@ public object KotlinCompilerClient {
            // TODO: doesn't seem reliable enough, consider more checks if OS is of windows flavor, etc.
            if (javaw.exists() && javaw.isFile && javaw.canExecute()) javaw else File(it, "java")
        }
-        val args = listOf(javaExecutable.absolutePath,
-                          "-cp", compilerId.compilerClasspath.joinToString(File.pathSeparator)) +
+        // TODO add os detection to specify option more precisely
+        val platformSpecificOptions = listOf("-Djava.awt.headless=true") // hide daemon in OS X
+        val args = listOf(javaExecutable.absolutePath, "-cp", compilerId.compilerClasspath.joinToString(File.pathSeparator)) +
+                   platformSpecificOptions +
                   daemonJVMOptions.mappers.flatMap { it.toArgs("-") } +
                   COMPILER_DAEMON_CLASS_FQN +
                   daemonOptions.mappers.flatMap { it.toArgs(COMPILE_DAEMON_CMDLINE_OPTIONS_PREFIX) } +