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

IC: Fix CacheVersionsManager IC flag set.

Browse Source 
Previously flag was set before the IncrementalCompilation.isEnabledForJvm() system property was set.
This cases that the cache versions was not saved.
This commit is contained in:
Sergey Rostov
2018-08-31 13:17:05 +03:00
parent 5f18439442
commit cdcc588a55
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt
+2 -2
View File
@@ -38,13 +38,13 @@ fun makeJsIncrementally(
messageCollector: MessageCollector = MessageCollector.NONE, messageCollector: MessageCollector = MessageCollector.NONE,
reporter: ICReporter = EmptyICReporter reporter: ICReporter = EmptyICReporter
) { ) {
val isIncremental = IncrementalCompilation.isEnabledForJs()
val versions = commonCacheVersionsManagers(cachesDir, isIncremental) + standaloneCacheVersionManager(cachesDir, isIncremental)
val allKotlinFiles = sourceRoots.asSequence().flatMap { it.walk() } val allKotlinFiles = sourceRoots.asSequence().flatMap { it.walk() }
.filter { it.isFile && it.extension.equals("kt", ignoreCase = true) }.toList() .filter { it.isFile && it.extension.equals("kt", ignoreCase = true) }.toList()
val buildHistoryFile = File(cachesDir, "build-history.bin") val buildHistoryFile = File(cachesDir, "build-history.bin")
withJsIC { withJsIC {
val versions = commonCacheVersionsManagers(cachesDir, true) + standaloneCacheVersionManager(cachesDir, true)
val compiler = IncrementalJsCompilerRunner( val compiler = IncrementalJsCompilerRunner(
cachesDir, versions, reporter, cachesDir, versions, reporter,
buildHistoryFile = buildHistoryFile, buildHistoryFile = buildHistoryFile,
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt
+2 -3
View File
@@ -57,9 +57,6 @@ fun makeIncrementally(
messageCollector: MessageCollector = MessageCollector.NONE, messageCollector: MessageCollector = MessageCollector.NONE,
reporter: ICReporter = EmptyICReporter reporter: ICReporter = EmptyICReporter
) { ) {
val isIncremental = IncrementalCompilation.isEnabledForJvm()
val versions = commonCacheVersionsManagers(cachesDir, isIncremental) + standaloneCacheVersionManager(cachesDir, isIncremental)
val kotlinExtensions = listOf("kt", "kts") val kotlinExtensions = listOf("kt", "kts")
val allExtensions = kotlinExtensions + listOf("java") val allExtensions = kotlinExtensions + listOf("java")
val rootsWalk = sourceRoots.asSequence().flatMap { it.walk() } val rootsWalk = sourceRoots.asSequence().flatMap { it.walk() }
@@ -68,6 +65,8 @@ fun makeIncrementally(
val buildHistoryFile = File(cachesDir, "build-history.bin") val buildHistoryFile = File(cachesDir, "build-history.bin")
withIC { withIC {
val versions = commonCacheVersionsManagers(cachesDir, true) + standaloneCacheVersionManager(cachesDir, true)
val compiler = IncrementalJvmCompilerRunner( val compiler = IncrementalJvmCompilerRunner(
cachesDir, cachesDir,
sourceRoots.map { JvmSourceRoot(it, null) }.toSet(), sourceRoots.map { JvmSourceRoot(it, null) }.toSet(),