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

Fix the build

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-13 00:00:17 +03:00
parent 41c5568b74
commit bdae0b5efb
7 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+1 -1
View File
@@ -132,7 +132,7 @@ interface CompileService : Remote {
@Throws(RemoteException::class)
fun compile(
sessionId: Int,
compilerArguments: CommonCompilerArguments,
compilerArguments: Array<String>,
compilationOptions: CompilationOptions,
servicesFacade: CompilerServicesFacadeBase,
compilationResultsSink: CompilationResultsSink?
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+18 -12
View File
@@ -23,10 +23,7 @@ import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import org.jetbrains.kotlin.cli.common.CLICompiler
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
import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.*
import org.jetbrains.kotlin.cli.common.messages.*
import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser
import org.jetbrains.kotlin.cli.common.repl.ReplCheckResult
@@ -46,10 +43,8 @@ import org.jetbrains.kotlin.incremental.*
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
import org.jetbrains.kotlin.progress.CompilationCanceledStatus
import org.jetbrains.kotlin.utils.addToStdlib.check
import java.io.BufferedOutputStream
import java.io.ByteArrayOutputStream
import java.io.File
import java.io.PrintStream
import org.jetbrains.kotlin.utils.stackTraceStr
import java.io.*
import java.rmi.NoSuchObjectException
import java.rmi.registry.Registry
import java.rmi.server.UnicastRemoteObject
@@ -321,7 +316,7 @@ class CompileServiceImpl(
override fun compile(
sessionId: Int,
compilerArguments: CommonCompilerArguments,
compilerArguments: Array<String>,
compilationOptions: CompilationOptions,
servicesFacade: CompilerServicesFacadeBase,
compilationResultsSink: CompilationResultsSink?
@@ -330,6 +325,17 @@ class CompileServiceImpl(
val daemonReporter = DaemonMessageReporter(servicesFacade, compilationOptions)
val compilerMode = compilationOptions.compilerMode
val targetPlatform = compilationOptions.targetPlatform
val k2PlatformArgs = try {
when (targetPlatform) {
CompileService.TargetPlatform.JVM -> K2JVMCompilerArguments().apply { K2JVMCompiler().parseArguments(compilerArguments, this) }
CompileService.TargetPlatform.JS -> K2JSCompilerArguments().apply { K2JSCompiler().parseArguments(compilerArguments, this) }
CompileService.TargetPlatform.METADATA -> K2MetadataCompilerArguments().apply { K2MetadataCompiler().parseArguments(compilerArguments, this) }
}
}
catch (e: IllegalArgumentException) {
messageCollector.report(CompilerMessageSeverity.EXCEPTION, e.stackTraceStr, CompilerMessageLocation.NO_LOCATION)
return CompileService.CallResult.Error("Could not deserialize compiler arguments")
}
return when (compilerMode) {
CompilerMode.JPS_COMPILER -> {
@@ -337,12 +343,12 @@ class CompileServiceImpl(
doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler ->
val services = createCompileServices(jpsServicesFacade, eventManger, profiler)
execCompiler(compilationOptions.targetPlatform, services, compilerArguments, messageCollector)
execCompiler(compilationOptions.targetPlatform, services, k2PlatformArgs, messageCollector)
}
}
CompilerMode.NON_INCREMENTAL_COMPILER -> {
doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler ->
execCompiler(targetPlatform, Services.EMPTY, compilerArguments, messageCollector)
execCompiler(targetPlatform, Services.EMPTY, k2PlatformArgs, messageCollector)
}
}
CompilerMode.INCREMENTAL_COMPILER -> {
@@ -350,7 +356,7 @@ class CompileServiceImpl(
throw IllegalStateException("Incremental compilation is not supported for target platform: $targetPlatform")
}
val k2jvmArgs = compilerArguments as K2JVMCompilerArguments
val k2jvmArgs = k2PlatformArgs as K2JVMCompilerArguments
val gradleIncrementalArgs = compilationOptions as IncrementalCompilationOptions
val gradleIncrementalServicesFacade = servicesFacade as IncrementalCompilerServicesFacade