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

Rename IncrementalCacheImpl->IncrementalJvmCache

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-08-21 03:29:27 +03:00
parent 093bbc069a
commit 919daefb0e
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheImpl.kt → build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt
+1 -1
View File
@@ -40,7 +40,7 @@ import java.util.*
val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin"
open class IncrementalCacheImpl(
open class IncrementalJvmCache(
private val targetDataRoot: File,
targetOutputDir: File?
) : IncrementalCacheCommon(File(targetDataRoot, KOTLIN_CACHE_DIRECTORY_NAME)), IncrementalCache {
build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
+1 -1
View File
@@ -78,7 +78,7 @@ fun makeCompileServices(
fun updateIncrementalCache(
generatedFiles: Iterable<GeneratedFile>,
cache: IncrementalCacheImpl,
cache: IncrementalJvmCache,
changesCollector: ChangesCollector
) {
for (generatedFile in generatedFiles) {
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCachesManager.kt
+2 -2
View File
@@ -71,10 +71,10 @@ class IncrementalJvmCachesManager(
cacheDirectory: File,
outputDir: File,
reporter: ICReporter
) : IncrementalCachesManager<IncrementalCacheImpl>(cacheDirectory, reporter) {
) : IncrementalCachesManager<IncrementalJvmCache>(cacheDirectory, reporter) {
private val jvmCacheDir = File(cacheDirectory, "jvm").apply { mkdirs() }
override val platformCache = IncrementalCacheImpl(jvmCacheDir, outputDir).apply { registerCache() }
override val platformCache = IncrementalJvmCache(jvmCacheDir, outputDir).apply { registerCache() }
}
class IncrementalJsCachesManager(
jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+4 -4
View File
@@ -420,7 +420,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
private fun doCompileModuleChunk(
allCompiledFiles: MutableSet<File>, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext,
dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>, environment: JpsCompilerEnvironment,
filesToCompile: MultiMap<ModuleBuildTarget, File>, incrementalCaches: Map<ModuleBuildTarget, IncrementalCacheImpl>,
filesToCompile: MultiMap<ModuleBuildTarget, File>, incrementalCaches: Map<ModuleBuildTarget, IncrementalJvmCache>,
project: JpsProject
): OutputItemsCollector? {
@@ -539,7 +539,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>,
filesToCompile: MultiMap<ModuleBuildTarget, File>,
outputItems: Map<ModuleBuildTarget, Iterable<GeneratedFile>>,
incrementalCaches: Map<ModuleBuildTarget, JpsIncrementalCacheImpl>
incrementalCaches: Map<ModuleBuildTarget, JpsIncrementalJvmCache>
) {
val previousMappings = context.projectDescriptor.dataManager.mappings
val callback = JavaBuilderUtil.getDependenciesRegistrar(context)
@@ -779,7 +779,7 @@ private fun ChangesCollector.processChangesUsingLookups(
compiledFiles: Set<File>,
dataManager: BuildDataManager,
fsOperations: FSOperationsHelper,
caches: Iterable<IncrementalCacheImpl>
caches: Iterable<IncrementalJvmCache>
) {
val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider)
val allCaches = caches.flatMap { it.thisWithDependentCaches }
@@ -803,7 +803,7 @@ private fun getLookupTracker(project: JpsProject): LookupTracker {
return testLookupTracker
}
private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map<ModuleBuildTarget, JpsIncrementalCacheImpl> {
private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map<ModuleBuildTarget, JpsIncrementalJvmCache> {
val dependentTargets = getDependentTargets(chunk, context)
val dataManager = context.projectDescriptor.dataManager
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt → jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalJvmCache.kt
+7 -7
View File
@@ -21,14 +21,14 @@ import org.jetbrains.jps.builders.storage.StorageProvider
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.incremental.storage.BuildDataManager
import org.jetbrains.jps.incremental.storage.StorageOwner
import org.jetbrains.kotlin.incremental.IncrementalCacheImpl
import org.jetbrains.kotlin.incremental.IncrementalJvmCache
import org.jetbrains.kotlin.jps.build.KotlinBuilder
import java.io.File
class JpsIncrementalCacheImpl(
class JpsIncrementalJvmCache(
target: ModuleBuildTarget,
paths: BuildDataPaths
) : IncrementalCacheImpl(paths.getTargetDataRoot(target), target.outputDir), StorageOwner {
) : IncrementalJvmCache(paths.getTargetDataRoot(target), target.outputDir), StorageOwner {
override fun debugLog(message: String) {
KotlinBuilder.LOG.debug(message)
}
@@ -37,16 +37,16 @@ class JpsIncrementalCacheImpl(
private class KotlinIncrementalStorageProvider(
private val target: ModuleBuildTarget,
private val paths: BuildDataPaths
) : StorageProvider<JpsIncrementalCacheImpl>() {
) : StorageProvider<JpsIncrementalJvmCache>() {
override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target
override fun hashCode() = target.hashCode()
override fun createStorage(targetDataDir: File): JpsIncrementalCacheImpl =
JpsIncrementalCacheImpl(target, paths)
override fun createStorage(targetDataDir: File): JpsIncrementalJvmCache =
JpsIncrementalJvmCache(target, paths)
}
fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): JpsIncrementalCacheImpl =
fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): JpsIncrementalJvmCache =
getStorage(target, KotlinIncrementalStorageProvider(target, dataPaths))