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

Fix formatting of HostManager.kt

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-03-17 15:19:11 +07:00
committed by Space
parent 7fabc19326
commit d7bd3d671c
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
+19 -18
View File
@@ -10,13 +10,13 @@ import java.lang.Exception
// TODO: Consider redesigning experimental targets support (e.g. by getting rid of such separation at all). // TODO: Consider redesigning experimental targets support (e.g. by getting rid of such separation at all).
open class HostManager( open class HostManager(
subTargetProvider: SubTargetProvider = SubTargetProvider.NoSubTargets, subTargetProvider: SubTargetProvider = SubTargetProvider.NoSubTargets,
private val experimental: Boolean = false private val experimental: Boolean = false
) { ) {
constructor( constructor(
distribution: Distribution, distribution: Distribution,
experimental: Boolean = false experimental: Boolean = false
) : this(distribution.subTargetProvider, experimental || distribution.experimentalEnabled) ) : this(distribution.subTargetProvider, experimental || distribution.experimentalEnabled)
fun targetManager(userRequest: String? = null): TargetManager = TargetManagerImpl(userRequest, this) fun targetManager(userRequest: String? = null): TargetManager = TargetManagerImpl(userRequest, this)
@@ -118,7 +118,7 @@ open class HostManager(
enabledExperimentalByHost[host]?.toList() ?: throw TargetSupportException("Unknown host platform: $host") enabledExperimentalByHost[host]?.toList() ?: throw TargetSupportException("Unknown host platform: $host")
} }
val enabled : List<KonanTarget> val enabled: List<KonanTarget>
get() = if (experimental) enabledRegular + enabledExperimental else enabledRegular get() = if (experimental) enabledRegular + enabledExperimental else enabledRegular
fun isEnabled(target: KonanTarget) = enabled.contains(target) fun isEnabled(target: KonanTarget) = enabled.contains(target)
@@ -169,35 +169,36 @@ open class HostManager(
val defaultJvmArgs = listOf("-XX:TieredStopAtLevel=1", "-ea", "-Dfile.encoding=UTF-8") val defaultJvmArgs = listOf("-XX:TieredStopAtLevel=1", "-ea", "-Dfile.encoding=UTF-8")
val regularJvmArgs = defaultJvmArgs + "-Xmx3G" val regularJvmArgs = defaultJvmArgs + "-Xmx3G"
val hostIsMac = (host.family == Family.OSX) val hostIsMac = (host.family == Family.OSX)
val hostIsLinux = (host.family == Family.LINUX) val hostIsLinux = (host.family == Family.LINUX)
val hostIsMingw = (host.family == Family.MINGW) val hostIsMingw = (host.family == Family.MINGW)
val hostSuffix get() = host.name val hostSuffix get() = host.name
@JvmStatic @JvmStatic
val hostName get() = host.name val hostName
get() = host.name
val knownTargetTemplates = listOf("zephyr") val knownTargetTemplates = listOf("zephyr")
private val targetAliasResolutions = mapOf( private val targetAliasResolutions = mapOf(
"linux" to "linux_x64", "linux" to "linux_x64",
"macbook" to "macos_x64", "macbook" to "macos_x64",
"macos" to "macos_x64", "macos" to "macos_x64",
"imac" to "macos_x64", "imac" to "macos_x64",
"raspberrypi" to "linux_arm32_hfp", "raspberrypi" to "linux_arm32_hfp",
"iphone32" to "ios_arm32", "iphone32" to "ios_arm32",
"iphone" to "ios_arm64", "iphone" to "ios_arm64",
"ipad" to "ios_arm64", "ipad" to "ios_arm64",
"ios" to "ios_arm64", "ios" to "ios_arm64",
"iphone_sim" to "ios_x64", "iphone_sim" to "ios_x64",
"mingw" to "mingw_x64" "mingw" to "mingw_x64"
) )
private val targetAliases: Map<String, List<String>> by lazy { private val targetAliases: Map<String, List<String>> by lazy {
val result = mutableMapOf<String, MutableList<String>>() val result = mutableMapOf<String, MutableList<String>>()
targetAliasResolutions.entries.forEach { targetAliasResolutions.entries.forEach {
result.getOrPut(it.value, { mutableListOf() } ).add(it.key) result.getOrPut(it.value, { mutableListOf() }).add(it.key)
} }
result result
} }