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

[Analysis API] Use library name in result jar

Browse Source 
^KT-62888
^KT-62651
This commit is contained in:
Dmitrii Gridin
2024-01-02 15:20:10 +01:00
committed by Space Team
parent a341dc704f
commit 02d99769ff
14 changed files with 51 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CliTestModuleCompilers.kt
+5 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -37,12 +37,13 @@ abstract class CliTestModuleCompiler : TestModuleCompiler() {
compilerKind,
tmpDir,
buildCompilerOptions(module, testServices),
compilationErrorExpected = Directives.COMPILATION_ERRORS in module.directives
compilationErrorExpected = Directives.COMPILATION_ERRORS in module.directives,
libraryName = module.name,
)
override fun compileTestModuleToLibrarySources(module: TestModule, testServices: TestServices): Path {
val tmpDir = KtTestUtil.tmpDir("testSourcesToCompile").toPath()
val librarySourcesPath = tmpDir / "library-sources.jar"
val librarySourcesPath = tmpDir / "${module.name}-sources.jar"
val manifest = Manifest().apply { mainAttributes[Attributes.Name.MANIFEST_VERSION] = "1.0" }
JarOutputStream(librarySourcesPath.outputStream(), manifest).use { jarOutputStream ->
for (testFile in module.files) {
@@ -50,6 +51,7 @@ abstract class CliTestModuleCompiler : TestModuleCompiler() {
addFileToJar(testFile.relativePath, text, jarOutputStream)
}
}
return librarySourcesPath
}
analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt
+14 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -15,9 +15,15 @@ import java.nio.file.Path
import kotlin.io.path.*
internal object CompilerExecutor {
fun compileLibrary(compilerKind: CompilerKind, sourcesPath: Path, options: List<String>, compilationErrorExpected: Boolean): Path {
fun compileLibrary(
compilerKind: CompilerKind,
sourcesPath: Path,
options: List<String>,
compilationErrorExpected: Boolean,
libraryName: String,
): Path {
val library = try {
compile(compilerKind, sourcesPath, options)
compile(compilerKind, sourcesPath, options, libraryName)
} catch (e: Throwable) {
if (!compilationErrorExpected) {
throw IllegalStateException("Unexpected compilation error while compiling library", e)
@@ -34,12 +40,13 @@ internal object CompilerExecutor {
return library
}
private fun compile(compilerKind: CompilerKind, sourcesPath: Path, options: List<String>): Path {
private fun compile(compilerKind: CompilerKind, sourcesPath: Path, options: List<String>, libraryName: String): Path {
val sourceFiles = sourcesPath.toFile().walkBottomUp()
val library = when (compilerKind) {
CompilerKind.JVM -> sourcesPath / "library.jar"
CompilerKind.JS -> sourcesPath / "library.klib"
CompilerKind.JVM -> sourcesPath / "$libraryName.jar"
CompilerKind.JS -> sourcesPath / "$libraryName.klib"
}
when (compilerKind) {
CompilerKind.JVM -> {
val commands = buildList {
@@ -53,7 +60,7 @@ internal object CompilerExecutor {
CompilerKind.JS -> {
val commands = buildList {
add(K2JSCompilerArguments::metaInfo.cliArgument)
add(K2JSCompilerArguments::moduleName.cliArgument); add("library")
add(K2JSCompilerArguments::moduleName.cliArgument); add(libraryName)
add(K2JSCompilerArguments::outputDir.cliArgument); add(library.parent.absolutePathString())
add(K2JSCompilerArguments::irProduceKlibFile.cliArgument)
sourceFiles.mapTo(this) { it.absolutePath }