Convert absolute to relative pluginsClasspath..

..to avoid recompilation on build with portable caches

#KT-62256 Fixed


Merge-request: KT-MR-12377
Merged-by: Aleksei Cherepanov <aleksei.cherepanov@jetbrains.com>

jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt

@@ -11,11 +11,17 @@ import org.jetbrains.jps.builders.*
 import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
 import org.jetbrains.jps.cmdline.ProjectDescriptor
 import org.jetbrains.jps.incremental.ModuleBuildTarget
+import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.config.KotlinFacetSettings
 import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME
 import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories
 import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
 import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
+import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import java.io.File
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.createTempDirectory
 import kotlin.reflect.KFunction1
@@ -43,6 +49,11 @@ class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() {
         buildTwiceAndCompare(RelocatableCacheTestCase::testRelocatableCaches)
     }
 
+
+    fun testRelocatablePluginClasspath() {
+        buildTwiceAndCompare(RelocatableCacheTestCase::testRelocatablePluginClasspath)
+    }
+
     private fun buildTwiceAndCompare(testMethod: KFunction1<RelocatableCacheTestCase, Unit>) {
         val test1WorkingDir = workingDir.resolve("test1")
         val test1KotlinCachesDir = workingDir.resolve("test1KotlinCaches")
@@ -91,6 +102,39 @@ abstract class RelocatableCacheTestCase(
         )
     }
 
+    @WorkingDir("KotlinProject")
+    fun testRelocatablePluginClasspath() {
+        initProject(LibraryDependency.JVM_FULL_RUNTIME)
+
+        //create lib
+        val libraryName = "module1-1.0-SNAPSHOT"
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.resolve("non-existent-folder").absolutePath, libraryName)
+        val module1Lib = this.workDir.resolve("lib").resolve("$libraryName.jar")
+        Files.createDirectories(module1Lib.parentFile.toPath())
+        Files.copy(libraryJar.toPath(), module1Lib.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        assert(module1Lib.exists())
+
+        // Add facet
+        myProject.modules.forEach {
+            val facet = KotlinFacetSettings()
+            facet.useProjectSettings = false
+            facet.compilerArguments = K2JVMCompilerArguments().apply {
+                pluginClasspaths = arrayOf(module1Lib.absolutePath)
+            }
+
+            it.container.setChild(
+                JpsKotlinFacetModuleExtension.KIND,
+                JpsKotlinFacetModuleExtension(facet)
+            )
+        }
+        buildAllModules().assertSuccessful()
+
+        assertFilesExistInOutput(
+            myProject.modules.single(),
+            "Test1Kt.class"
+        )
+    }
+
     override fun copyTestDataToTmpDir(testDataDir: File): File {
         testDataDir.copyRecursively(projectWorkingDir)
         return projectWorkingDir
@@ -115,6 +159,8 @@ abstract class RelocatableCacheTestCase(
             kotlinDataPaths.add(kotlinDataRoot)
         }
 
+        findFileInDirectory(descriptor.dataManager.dataPaths.dataStorageRoot, "jvm-build-meta-info.txt")!!.also { kotlinDataPaths.add(it) }
+
         dirToCopyKotlinCaches.deleteRecursively()
         val originalStorageRoot = descriptor.dataManager.dataPaths.dataStorageRoot
         for (kotlinCacheRoot in kotlinDataPaths) {
@@ -125,6 +171,27 @@ abstract class RelocatableCacheTestCase(
         }
     }
 
+    private fun findFileInDirectory(directory: File, fileNameToFind: String): File? {
+        val foundFiles = directory.listFiles { file ->
+            file.isFile && file.name == fileNameToFind
+        } ?: return null
+
+        if (foundFiles.isNotEmpty()) {
+            return foundFiles.firstOrNull()
+        }
+
+        val subdirectories = directory.listFiles { file -> file.isDirectory } ?: return null
+
+        for (subdirectory in subdirectories) {
+            val foundFile = findFileInDirectory(subdirectory, fileNameToFind)
+            if (foundFile != null) {
+                return foundFile
+            }
+        }
+
+        return null
+    }
+
     private fun BuildTarget<*>.isKotlinTarget(descriptor: ProjectDescriptor): Boolean {
         fun JavaSourceRootDescriptor.containsKotlinSources() = root.walk().any { it.isKotlinSourceFile }
 

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinCommonModuleBuildTarget.kt

@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
 import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
 import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
+import org.jetbrains.kotlin.incremental.storage.RelativeFileToPathConverter
 import org.jetbrains.kotlin.jps.build.KotlinCompileContext
 import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
 import org.jetbrains.kotlin.jps.build.ModuleBuildTarget
@@ -38,7 +39,7 @@ class KotlinCommonModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModu
         get() = COMMON_BUILD_META_INFO_FILE_NAME
 
     override val buildMetaInfo: CommonBuildMetaInfo
-        get() = CommonBuildMetaInfo()
+        get() = CommonBuildMetaInfo(kotlinContext.fileToPathConverter as? RelativeFileToPathConverter)
 
     override val globalLookupCacheId: String
         get() = "metadata-compiler"

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJsModuleBuildTarget.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
 import org.jetbrains.kotlin.incremental.js.IncrementalDataProviderFromCache
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl
+import org.jetbrains.kotlin.incremental.storage.RelativeFileToPathConverter
 import org.jetbrains.kotlin.jps.build.KotlinCompileContext
 import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
 import org.jetbrains.kotlin.jps.build.ModuleBuildTarget
@@ -55,7 +56,7 @@ class KotlinJsModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleBu
         get() = JS_BUILD_META_INFO_FILE_NAME
 
     override val buildMetaInfo: JsBuildMetaInfo
-        get() = JsBuildMetaInfo()
+        get() = JsBuildMetaInfo(kotlinContext.fileToPathConverter as? RelativeFileToPathConverter)
 
     val isFirstBuild: Boolean
         get() {

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.incremental.*
 import org.jetbrains.kotlin.incremental.components.*
+import org.jetbrains.kotlin.incremental.storage.RelativeFileToPathConverter
 import org.jetbrains.kotlin.jps.build.KotlinBuilder
 import org.jetbrains.kotlin.jps.build.KotlinCompileContext
 import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
@@ -64,7 +65,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
         get() = JVM_BUILD_META_INFO_FILE_NAME
 
     override val buildMetaInfo: JvmBuildMetaInfo
-        get() = JvmBuildMetaInfo()
+        get() = JvmBuildMetaInfo(kotlinContext.fileToPathConverter as? RelativeFileToPathConverter)
 
     override val targetId: TargetId
         get() {