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

Minor: move CompilerMode

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-13 09:19:57 +03:00
parent 072edf4b5a
commit a3415d8d0e
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
+8 -2
View File
@@ -20,7 +20,7 @@ import java.io.File
import java.io.Serializable
open class CompilationOptions(
val compilerMode: CompileService.CompilerMode,
val compilerMode: CompilerMode,
val targetPlatform: CompileService.TargetPlatform,
val reportCategories: Array<Int>,
val reportSeverity: Int,
@@ -38,7 +38,7 @@ class IncrementalCompilationOptions(
val workingDir: File,
val customCacheVersionFileName: String,
val customCacheVersion: Int,
compilerMode: CompileService.CompilerMode,
compilerMode: CompilerMode,
targetPlatform: CompileService.TargetPlatform,
reportCategories: Array<Int>,
reportSeverity: Int,
@@ -48,3 +48,9 @@ class IncrementalCompilationOptions(
const val serialVersionUID: Long = 0
}
}
enum class CompilerMode : Serializable {
NON_INCREMENTAL_COMPILER,
INCREMENTAL_COMPILER,
JPS_COMPILER
}
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+1 -5
View File
@@ -36,11 +36,7 @@ interface CompileService : Remote {
METADATA
}
enum class CompilerMode : Serializable {
NON_INCREMENTAL_COMPILER,
INCREMENTAL_COMPILER,
JPS_COMPILER
}
companion object {
val NO_SESSION: Int = 0
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+3 -3
View File
@@ -332,7 +332,7 @@ class CompileServiceImpl(
val targetPlatform = compilationOptions.targetPlatform
return when (compilerMode) {
CompileService.CompilerMode.JPS_COMPILER -> {
CompilerMode.JPS_COMPILER -> {
val jpsServicesFacade = servicesFacade as JpsCompilerServicesFacade
doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler ->
@@ -340,12 +340,12 @@ class CompileServiceImpl(
execCompiler(compilationOptions.targetPlatform, services, compilerArguments, messageCollector)
}
}
CompileService.CompilerMode.NON_INCREMENTAL_COMPILER -> {
CompilerMode.NON_INCREMENTAL_COMPILER -> {
doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler ->
execCompiler(targetPlatform, Services.EMPTY, compilerArguments, messageCollector)
}
}
CompileService.CompilerMode.INCREMENTAL_COMPILER -> {
CompilerMode.INCREMENTAL_COMPILER -> {
if (targetPlatform != CompileService.TargetPlatform.JVM) {
throw IllegalStateException("Incremental compilation is not supported for target platform: $targetPlatform")
}