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

Minor: rename CACHE_DIRECTORY_NAME->KOTLIN_CACHE_DIRECTORY_NAME

Browse Source 
Original commit: 7fff17ba7c
This commit is contained in:
Alexey Tsvetkov
2015-12-02 18:21:35 +03:00
parent 9782e83c7e
commit a02c918251
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build
import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.builders.storage.BuildDataPaths
import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.BuildDataManager
import org.jetbrains.kotlin.jps.incremental.CACHE_DIRECTORY_NAME import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME
import java.io.File import java.io.File
private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt" private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt"
@@ -51,7 +51,7 @@ abstract class MarkerFile(private val fileName: String, private val paths: Build
private val ModuleBuildTarget.markerFile: File private val ModuleBuildTarget.markerFile: File
get() { get() {
val directory = File(paths.getTargetDataRoot(this), CACHE_DIRECTORY_NAME) val directory = File(paths.getTargetDataRoot(this), KOTLIN_CACHE_DIRECTORY_NAME)
return File(directory, fileName) return File(directory, fileName)
} }
} }
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+2 -6
View File
@@ -52,11 +52,7 @@ import java.io.File
import java.security.MessageDigest import java.security.MessageDigest
import java.util.* import java.util.*
internal val CACHE_DIRECTORY_NAME = "kotlin" val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin"
@TestOnly
public fun getCacheDirectoryName(): String =
CACHE_DIRECTORY_NAME
public class IncrementalCacheImpl( public class IncrementalCacheImpl(
private val target: ModuleBuildTarget, private val target: ModuleBuildTarget,
@@ -77,7 +73,7 @@ public class IncrementalCacheImpl(
private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT
} }
private val baseDir = File(paths.getTargetDataRoot(target), CACHE_DIRECTORY_NAME) private val baseDir = File(paths.getTargetDataRoot(target), KOTLIN_CACHE_DIRECTORY_NAME)
private val cacheVersionProvider = CacheVersionProvider(paths) private val cacheVersionProvider = CacheVersionProvider(paths)
private val String.storageFile: File private val String.storageFile: File
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
+2 -2
View File
@@ -22,8 +22,8 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths
import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.IncrementalCompilation
import org.jetbrains.kotlin.jps.incremental.CacheVersion import org.jetbrains.kotlin.jps.incremental.CacheVersion
import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider
import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME
import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName
import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner
import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.Printer
import java.io.File import java.io.File
@@ -95,7 +95,7 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps
for (target in targets.sortedBy { it.presentableName }) { for (target in targets.sortedBy { it.presentableName }) {
dumpCachesForTarget(p, paths, target, versions.normalVersion(target), versions.experimentalVersion(target), dumpCachesForTarget(p, paths, target, versions.normalVersion(target), versions.experimentalVersion(target),
subdirectory = getCacheDirectoryName()) subdirectory = KOTLIN_CACHE_DIRECTORY_NAME)
} }
return sb.toString() return sb.toString()