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

Clean only kotlin caches when incremental compilation is off

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-09-25 18:57:26 +03:00
parent 1298d115bd
commit ba33020140
6 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+6 -12
View File
@@ -137,18 +137,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
val dataManager = projectDescriptor.dataManager
if (!IncrementalCompilation.isEnabled()) {
dataManager.clean()
dataManager.flush(true)
}
else {
if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) {
LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join())
val incrementalCaches = getIncrementalCaches(chunk, context)
incrementalCaches.values().forEach(StorageOwner::clean)
FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk)
return ADDITIONAL_PASS_REQUIRED
}
if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) {
LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join())
val incrementalCaches = getIncrementalCaches(chunk, context)
incrementalCaches.values().forEach(StorageOwner::clean)
FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk)
return ADDITIONAL_PASS_REQUIRED
}
if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt
+2 -1
View File
@@ -38,9 +38,10 @@ class CacheFormatVersion(targetDataRoot: File) {
private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH)
fun isIncompatible(): Boolean {
assert(IncrementalCompilation.isEnabled()) { "Incremental compilation is not enabled" }
if (!file.exists()) return false
if (!IncrementalCompilation.isEnabled()) return true
val versionNumber = file.readText().toInt()
if (versionNumber != CACHE_FORMAT_VERSION) {