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

[KT-40670] Allow to override konan.properties from CLI

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-10-15 18:02:52 +07:00
parent ea34a588f3
commit 2ad13847d1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
+3 -3
View File
@@ -10,12 +10,12 @@ import org.jetbrains.kotlin.konan.properties.Properties
import org.jetbrains.kotlin.konan.properties.keepOnlyDefaultProfiles import org.jetbrains.kotlin.konan.properties.keepOnlyDefaultProfiles
import org.jetbrains.kotlin.konan.properties.loadProperties import org.jetbrains.kotlin.konan.properties.loadProperties
import org.jetbrains.kotlin.konan.util.DependencyDirectories import org.jetbrains.kotlin.konan.util.DependencyDirectories
import org.jetbrains.kotlin.konan.util.visibleName
class Distribution( class Distribution(
val konanHome: String, val konanHome: String,
private val onlyDefaultProfiles: Boolean = false, private val onlyDefaultProfiles: Boolean = false,
private val runtimeFileOverride: String? = null private val runtimeFileOverride: String? = null,
private val propertyOverrides: Map<String, String>? = null
) { ) {
val localKonanDir = DependencyDirectories.localKonanDir val localKonanDir = DependencyDirectories.localKonanDir
@@ -65,7 +65,7 @@ class Distribution(
if (onlyDefaultProfiles) { if (onlyDefaultProfiles) {
result.keepOnlyDefaultProfiles() result.keepOnlyDefaultProfiles()
} }
propertyOverrides?.let(result::putAll)
result result
} }