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

API 4 ABI: Rename manifest property: wasm_target -> wasm_targets

Browse Source 
^KT-66367
This commit is contained in:
Dmitriy Dolovov
2024-03-13 15:51:28 +01:00
committed by Space Team
parent 25de42b7eb
commit d43db973d4
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt
+3 -2
View File
@@ -695,8 +695,9 @@ fun serializeModuleIntoKlib(
if (jsOutputName != null) { if (jsOutputName != null) {
p.setProperty(KLIB_PROPERTY_JS_OUTPUT_NAME, jsOutputName) p.setProperty(KLIB_PROPERTY_JS_OUTPUT_NAME, jsOutputName)
} }
wasmTarget?.let { val wasmTargets = listOfNotNull(/* in the future there might be multiple WASM targets */ wasmTarget)
p.setProperty(KLIB_PROPERTY_WASM_TARGET, it.name.toLowerCaseAsciiOnly()) if (wasmTargets.isNotEmpty()) {
p.setProperty(KLIB_PROPERTY_WASM_TARGETS, wasmTargets.joinToString(" ") { it.alias })
} }
if (containsErrorCode) { if (containsErrorCode) {
p.setProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE, "true") p.setProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE, "true")
compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
+3 -3
View File
@@ -39,7 +39,7 @@ const val KLIB_PROPERTY_IR_PROVIDER = "ir_provider"
* Copy-pasted to `kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt` * Copy-pasted to `kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt`
*/ */
const val KLIB_PROPERTY_NATIVE_TARGETS = "native_targets" const val KLIB_PROPERTY_NATIVE_TARGETS = "native_targets"
const val KLIB_PROPERTY_WASM_TARGET = "wasm_target" const val KLIB_PROPERTY_WASM_TARGETS = "wasm_targets"
// Commonizer-specific: // Commonizer-specific:
/** /**
@@ -141,8 +141,8 @@ val BaseKotlinLibrary.irProviderName: String?
val BaseKotlinLibrary.nativeTargets: List<String> val BaseKotlinLibrary.nativeTargets: List<String>
get() = manifestProperties.propertyList(KLIB_PROPERTY_NATIVE_TARGETS) get() = manifestProperties.propertyList(KLIB_PROPERTY_NATIVE_TARGETS)
val BaseKotlinLibrary.wasmTarget: String? val BaseKotlinLibrary.wasmTargets: List<String>
get() = manifestProperties.getProperty(KLIB_PROPERTY_WASM_TARGET) get() = manifestProperties.propertyList(KLIB_PROPERTY_WASM_TARGETS)
val KotlinLibrary.containsErrorCode: Boolean val KotlinLibrary.containsErrorCode: Boolean
get() = manifestProperties.getProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE) == "true" get() = manifestProperties.getProperty(KLIB_PROPERTY_CONTAINS_ERROR_CODE) == "true"
js/js.frontend/src/org/jetbrains/kotlin/js/config/WasmTarget.kt
+4 -8
View File
@@ -7,16 +7,12 @@ package org.jetbrains.kotlin.js.config
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
enum class WasmTarget { enum class WasmTarget(val alias: String) {
JS, JS("wasm-js"),
WASI; WASI("wasm-wasi");
companion object { companion object {
fun fromName(name: String): WasmTarget? = when (name) { fun fromName(name: String): WasmTarget? = WasmTarget.entries.firstOrNull { it.alias == name }
"wasm-js" -> JS
"wasm-wasi" -> WASI
else -> null
}
} }
} }