mirror of
https://github.com/jlengrand/kotlin.git
synced 2026-03-10 08:31:29 +00:00
CliCommonizer: Guard input- and dependency- libraries
This commit is contained in:
committed by
Space
parent
d03a85525d
commit
b68fee9cbc
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.descriptors.commonizer
|
||||
|
||||
import java.io.File
|
||||
import java.net.URLClassLoader
|
||||
import kotlin.jvm.Throws
|
||||
|
||||
public fun CliCommonizer(classpath: Iterable<File>): CliCommonizer {
|
||||
return CliCommonizer(URLClassLoader(classpath.map { it.absoluteFile.toURI().toURL() }.toTypedArray()))
|
||||
@@ -30,13 +29,16 @@ public class CliCommonizer(private val executor: Executor) : Commonizer {
|
||||
outputCommonizerTarget: SharedCommonizerTarget,
|
||||
outputDirectory: File
|
||||
) {
|
||||
if (inputLibraries.isEmpty()) return
|
||||
val arguments = mutableListOf<String>().apply {
|
||||
add("native-klib-commonize")
|
||||
add("-distribution-path"); add(konanHome.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-path"); add(outputDirectory.absolutePath)
|
||||
if (dependencyLibraries.isNotEmpty()) {
|
||||
add("-dependency-libraries"); add(dependencyLibraries.joinToString(";") { it.absolutePath })
|
||||
}
|
||||
}
|
||||
executor(arguments)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user