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

[Test] Unify work with KLIB artifact paths and dependencies

Browse Source 
Unify functions from `JsEnvironmentConfigurator` and
`WasmEnvironmentConfigurator` that do the same logic. Make this logic
also be available for `NativeEnvironmentConfigurator`:
- get*ArtifactSimpleName()
- get*KlibArtifactPath()
- get*KlibOutputDir()
- getAllRecursiveLibrariesFor()
- getAllRecursiveDependenciesFor()
- getAllDependenciesMappingFor()
- getKlibDependencies()

This would allow to have the same logic in one place, and also
reuse it in `IrBackendFacade`s to be implemented for Native.

^KT-65117
This commit is contained in:
Dmitriy Dolovov
2024-01-19 12:59:52 +01:00
committed by Space Team
parent 7e9e064748
commit f204293e4d
10 changed files with 115 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/converters/FirWasmKlibBackendFacade.kt
+5 -6
View File
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.test.model.BinaryArtifacts
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.*
import org.jetbrains.kotlin.test.services.configuration.WasmEnvironmentConfigurator
import java.io.File
class FirWasmKlibBackendFacade(
testServices: TestServices,
@@ -50,7 +49,7 @@ class FirWasmKlibBackendFacade(
}
val configuration = testServices.compilerConfigurationProvider.getCompilerConfiguration(module)
val outputFile = WasmEnvironmentConfigurator.getWasmKlibArtifactPath(testServices, module.name)
val outputFile = WasmEnvironmentConfigurator.getKlibArtifactFile(testServices, module.name)
// TODO: consider avoiding repeated libraries resolution
val target = configuration.get(JSConfigurationKeys.WASM_TARGET, WasmTarget.JS)
@@ -62,7 +61,7 @@ class FirWasmKlibBackendFacade(
configuration,
inputArtifact.diagnosticReporter,
inputArtifact.metadataSerializer,
klibPath = outputFile,
klibPath = outputFile.path,
libraries.map { it.library },
inputArtifact.irModuleFragment,
cleanFiles = inputArtifact.icData,
@@ -76,7 +75,7 @@ class FirWasmKlibBackendFacade(
// TODO: consider avoiding repeated libraries resolution
val lib = CommonKLibResolver.resolve(
getAllWasmDependenciesPaths(module, testServices, target) + listOf(outputFile),
getAllWasmDependenciesPaths(module, testServices, target) + listOf(outputFile.path),
configuration.getLogger(treatWarningsAsErrors = true)
).getFullResolvedList().last().library
@@ -94,8 +93,8 @@ class FirWasmKlibBackendFacade(
)
testServices.moduleDescriptorProvider.replaceModuleDescriptorForModule(module, moduleDescriptor)
testServices.libraryProvider.setDescriptorAndLibraryByName(outputFile, moduleDescriptor, lib)
testServices.libraryProvider.setDescriptorAndLibraryByName(outputFile.path, moduleDescriptor, lib)
return BinaryArtifacts.KLib(File(outputFile), inputArtifact.diagnosticReporter)
return BinaryArtifacts.KLib(outputFile, inputArtifact.diagnosticReporter)
}
}