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

CliCommonizer: Guard input- and dependency- libraries

Browse Source
This commit is contained in:
sebastian.sellmair
2021-03-15 16:32:01 +01:00
committed by Space
parent d03a85525d
commit b68fee9cbc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt
+4 -2
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.descriptors.commonizer
import java.io.File import java.io.File
import java.net.URLClassLoader import java.net.URLClassLoader
import kotlin.jvm.Throws
public fun CliCommonizer(classpath: Iterable<File>): CliCommonizer { public fun CliCommonizer(classpath: Iterable<File>): CliCommonizer {
return CliCommonizer(URLClassLoader(classpath.map { it.absoluteFile.toURI().toURL() }.toTypedArray())) return CliCommonizer(URLClassLoader(classpath.map { it.absoluteFile.toURI().toURL() }.toTypedArray()))
@@ -30,13 +29,16 @@ public class CliCommonizer(private val executor: Executor) : Commonizer {
outputCommonizerTarget: SharedCommonizerTarget, outputCommonizerTarget: SharedCommonizerTarget,
outputDirectory: File outputDirectory: File
) { ) {
if (inputLibraries.isEmpty()) return
val arguments = mutableListOf<String>().apply { val arguments = mutableListOf<String>().apply {
add("native-klib-commonize") add("native-klib-commonize")
add("-distribution-path"); add(konanHome.absolutePath) add("-distribution-path"); add(konanHome.absolutePath)
add("-input-libraries"); add(inputLibraries.joinToString(";") { it.absolutePath }) add("-input-libraries"); add(inputLibraries.joinToString(";") { it.absolutePath })
add("-dependency-libraries"); add(dependencyLibraries.joinToString(";") { it.absolutePath })
add("-output-commonizer-target"); add(outputCommonizerTarget.identityString) add("-output-commonizer-target"); add(outputCommonizerTarget.identityString)
add("-output-path"); add(outputDirectory.absolutePath) add("-output-path"); add(outputDirectory.absolutePath)
if (dependencyLibraries.isNotEmpty()) {
add("-dependency-libraries"); add(dependencyLibraries.joinToString(";") { it.absolutePath })
}
} }
executor(arguments) executor(arguments)
} }