Extract korlibs-wasm (#2194)

korlibs · Mar 9, 2024 · 4ce6a68 · 4ce6a68
1 parent 3303cd9
commit 4ce6a68
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 1 deletion.
diff --git a/korge-core/build.gradle.kts b/korge-core/build.gradle.kts
@@ -5,6 +5,7 @@ dependencies {
         //add("androidMainApi", "androidx.javascriptengine:javascriptengine:1.0.0-alpha05")
         //add("androidMainApi", "com.google.guava:guava:31.0.1-android")
     }
+    commonMainApi(project(":korlibs-wasm"))
     commonMainApi(project(":korlibs-ffi"))
     commonMainApi(project(":korlibs-io"))
     commonMainApi(project(":korlibs-template"))

diff --git a/korlibs-wasm/.gitignore b/korlibs-wasm/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/korlibs-wasm/build.gradle.kts b/korlibs-wasm/build.gradle.kts
@@ -0,0 +1,20 @@
+import korlibs.*
+
+description = "Korlibs WASM"
+
+project.extensions.extraProperties.properties.apply {
+    includeKotlinNativeDesktop()
+
+    applyProjectProperties(
+        "https://raw.githubusercontent.com/korlibs/korge/main/korlibs-wasm",
+        "",
+        "https://raw.githubusercontent.com/korlibs/korge/main/korlibs-wasm/LICENSE"
+    )
+}
+
+dependencies {
+    commonMainApi(project(":korlibs-io"))
+    //commonMainApi(project(":korlibs-ffi")) // @TODO: We should remove this dependency at some point
+    jvmMainImplementation(libs.asm.core)
+    jvmMainImplementation(libs.asm.util)
+}
diff --git a/korge-core/src/korlibs/wasm/DenoWASMLib.kt → korlibs-wasm/src/korlibs/wasm/DenoWASMLib.kt b/korge-core/src/korlibs/wasm/DenoWASMLib.kt → korlibs-wasm/src/korlibs/wasm/DenoWASMLib.kt
@@ -1,5 +1,6 @@
 package korlibs.wasm
 
+/*
 open class DenoWASMLib(content: ByteArray) : BaseWASMLib(content) {
     val runner = DenoWasmProcessStdin.open(content)
 
@@ -15,3 +16,4 @@ open class DenoWASMLib(content: ByteArray) : BaseWASMLib(content) {
     override fun invokeFuncIndirect(address: Int, vararg params: Any?): Any? = runner.executeFunctionIndirect(address, *params)
     override fun close() = runner.close()
 }
+*/
diff --git a/.../src/korlibs/wasm/DenoWasmProcessStdin.kt → .../src/korlibs/wasm/DenoWasmProcessStdin.kt b/.../src/korlibs/wasm/DenoWasmProcessStdin.kt → .../src/korlibs/wasm/DenoWasmProcessStdin.kt
@@ -1,5 +1,6 @@
 package korlibs.wasm
 
+/*
 import korlibs.datastructure.lock.*
 import korlibs.ffi.*
 import korlibs.io.file.sync.*
@@ -436,3 +437,4 @@ while (running) {
   }
 }
 """.trimIndent()
+*/
diff --git a/...re/src/korlibs/wasm/InterpreterWASMLib.kt → ...sm/src/korlibs/wasm/InterpreterWASMLib.kt b/...re/src/korlibs/wasm/InterpreterWASMLib.kt → ...sm/src/korlibs/wasm/InterpreterWASMLib.kt
diff --git a/...e-core/src/korlibs/wasm/WASMJSPolyfill.kt → ...s-wasm/src/korlibs/wasm/WASMJSPolyfill.kt b/...e-core/src/korlibs/wasm/WASMJSPolyfill.kt → ...s-wasm/src/korlibs/wasm/WASMJSPolyfill.kt
diff --git a/korge-core/src/korlibs/wasm/WASMLib.kt → korlibs-wasm/src/korlibs/wasm/WASMLib.kt b/korge-core/src/korlibs/wasm/WASMLib.kt → korlibs-wasm/src/korlibs/wasm/WASMLib.kt
diff --git a/...-core/src/korlibs/wasm/WasmCodeVisitor.kt → ...-wasm/src/korlibs/wasm/WasmCodeVisitor.kt b/...-core/src/korlibs/wasm/WasmCodeVisitor.kt → ...-wasm/src/korlibs/wasm/WasmCodeVisitor.kt
diff --git a/korge-core/src/korlibs/wasm/WasmCommon.kt → korlibs-wasm/src/korlibs/wasm/WasmCommon.kt b/korge-core/src/korlibs/wasm/WasmCommon.kt → korlibs-wasm/src/korlibs/wasm/WasmCommon.kt
diff --git a/...core/src/korlibs/wasm/WasmReaderBinary.kt → ...wasm/src/korlibs/wasm/WasmReaderBinary.kt b/...core/src/korlibs/wasm/WasmReaderBinary.kt → ...wasm/src/korlibs/wasm/WasmReaderBinary.kt
diff --git a/...e-core/src/korlibs/wasm/WasmReaderText.kt → ...s-wasm/src/korlibs/wasm/WasmReaderText.kt b/...e-core/src/korlibs/wasm/WasmReaderText.kt → ...s-wasm/src/korlibs/wasm/WasmReaderText.kt
diff --git a/...re/src/korlibs/wasm/WasmRunInterpreter.kt → ...sm/src/korlibs/wasm/WasmRunInterpreter.kt b/...re/src/korlibs/wasm/WasmRunInterpreter.kt → ...sm/src/korlibs/wasm/WasmRunInterpreter.kt
diff --git a/korge-core/src/korlibs/wasm/WasmRuntime.kt → korlibs-wasm/src/korlibs/wasm/WasmRuntime.kt b/korge-core/src/korlibs/wasm/WasmRuntime.kt → korlibs-wasm/src/korlibs/wasm/WasmRuntime.kt
diff --git a/...c@android/korlibs/wasm/WASMLib.android.kt → ...c@android/korlibs/wasm/WASMLib.android.kt b/...c@android/korlibs/wasm/WASMLib.android.kt → ...c@android/korlibs/wasm/WASMLib.android.kt
diff --git a/.../src@darwin/korlibs/wasm/WASMLib.apple.kt → .../src@darwin/korlibs/wasm/WASMLib.apple.kt b/.../src@darwin/korlibs/wasm/WASMLib.apple.kt → .../src@darwin/korlibs/wasm/WASMLib.apple.kt
diff --git a/korge-core/src@js/korlibs/wasm/WASMLib.js.kt → ...bs-wasm/src@js/korlibs/wasm/WASMLib.js.kt b/korge-core/src@js/korlibs/wasm/WASMLib.js.kt → ...bs-wasm/src@js/korlibs/wasm/WASMLib.js.kt
diff --git a/...-core/src@jvm/korlibs/wasm/WASMLib.jvm.kt → ...-wasm/src@jvm/korlibs/wasm/WASMLib.jvm.kt b/...-core/src@jvm/korlibs/wasm/WASMLib.jvm.kt → ...-wasm/src@jvm/korlibs/wasm/WASMLib.jvm.kt
diff --git a/...ore/src@jvm/korlibs/wasm/WasmRunJVMJIT.kt → ...asm/src@jvm/korlibs/wasm/WasmRunJVMJIT.kt b/...ore/src@jvm/korlibs/wasm/WasmRunJVMJIT.kt → ...asm/src@jvm/korlibs/wasm/WasmRunJVMJIT.kt
@@ -1,6 +1,5 @@
 package korlibs.wasm
 
-import korlibs.ffi.*
 import korlibs.math.*
 import korlibs.memory.*
 import korlibs.wasm.*

diff --git a/...e/src@wasmJs/korlibs/wasm/WASMLib.wasm.kt → ...m/src@wasmJs/korlibs/wasm/WASMLib.wasm.kt b/...e/src@wasmJs/korlibs/wasm/WASMLib.wasm.kt → ...m/src@wasmJs/korlibs/wasm/WASMLib.wasm.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -32,6 +32,7 @@ include(":korlibs-datastructure")
 include(":korlibs-memory")
 include(":korlibs-util")
 include(":korlibs-ffi")
+include(":korlibs-wasm")
 include(":korlibs-math-core")
 include(":korlibs-math")
 include(":korlibs-inject")