From 044210ddf0829fbd8dac5ef75eb4016d3a4e1f99 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 18 Sep 2024 00:10:12 +0800 Subject: [PATCH 1/4] jwasm: add package --- packages/j/jwasm/xmake.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/j/jwasm/xmake.lua diff --git a/packages/j/jwasm/xmake.lua b/packages/j/jwasm/xmake.lua new file mode 100644 index 00000000000..ad208b1ae5c --- /dev/null +++ b/packages/j/jwasm/xmake.lua @@ -0,0 +1,23 @@ +package("jwasm") + set_kind("binary") + set_homepage("https://github.com/JWasm/JWasm") + set_description("JWasm continuation") + + add_urls("https://github.com/JWasm/JWasm.git") + add_versions("2022.12.25", "7218960b65d69216693a655d928eb4c2fb6b505c") + + on_install(function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + target("jwasm") + set_kind("binary") + add_files("*.c") + add_includedirs("H") + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + -- os.vrun("jwasm -h") -- return 1 + assert(os.isexec(package:installdir("bin/jwasm") .. (is_host("windows") and ".exe" or ""))) + end) From 025bafded98a43f687dc2e6f23874c5b76f610b7 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 18 Sep 2024 00:25:20 +0800 Subject: [PATCH 2/4] limit plat --- packages/j/jwasm/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/j/jwasm/xmake.lua b/packages/j/jwasm/xmake.lua index ad208b1ae5c..8750c58704f 100644 --- a/packages/j/jwasm/xmake.lua +++ b/packages/j/jwasm/xmake.lua @@ -6,7 +6,7 @@ package("jwasm") add_urls("https://github.com/JWasm/JWasm.git") add_versions("2022.12.25", "7218960b65d69216693a655d928eb4c2fb6b505c") - on_install(function (package) + on_install("@windows", "@linux", "@macosx", "@bsd", "@mingw", "@msys", function (package) io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") target("jwasm") From 0926ff135a7d2b0cc39e6e820df38b365a197360 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Feb 2025 19:53:21 +0800 Subject: [PATCH 3/4] Update xmake.lua --- packages/j/jwasm/xmake.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/j/jwasm/xmake.lua b/packages/j/jwasm/xmake.lua index 8750c58704f..bac6ef29d8c 100644 --- a/packages/j/jwasm/xmake.lua +++ b/packages/j/jwasm/xmake.lua @@ -2,22 +2,29 @@ package("jwasm") set_kind("binary") set_homepage("https://github.com/JWasm/JWasm") set_description("JWasm continuation") + set_license("JWasm") add_urls("https://github.com/JWasm/JWasm.git") - add_versions("2022.12.25", "7218960b65d69216693a655d928eb4c2fb6b505c") + add_versions("2025.01.10", "a5c4ea03cc0545a15d81a354251b5f534bef7a1b") - on_install("@windows", "@linux", "@macosx", "@bsd", "@mingw", "@msys", function (package) + on_install(function (package) io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") target("jwasm") set_kind("binary") - add_files("*.c") + add_files("*.c|trmem.c") add_includedirs("H") + add_defines("DEBUG_OUT") + if is_plat("windows", "mingw") then + add_defines("__NT__") + else + add_defines("__UNIX__") + end ]]) import("package.tools.xmake").install(package) end) on_test(function (package) -- os.vrun("jwasm -h") -- return 1 - assert(os.isexec(package:installdir("bin/jwasm") .. (is_host("windows") and ".exe" or ""))) + assert(os.isexec(path.join(package:installdir("bin"), "jwasm" .. (is_host("windows") and ".exe" or "")))) end) From fe85047a00daeba0a24b7c19df63b43b92aacdf8 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Feb 2025 20:20:48 +0800 Subject: [PATCH 4/4] Update xmake.lua --- packages/j/jwasm/xmake.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/j/jwasm/xmake.lua b/packages/j/jwasm/xmake.lua index bac6ef29d8c..459874d36e5 100644 --- a/packages/j/jwasm/xmake.lua +++ b/packages/j/jwasm/xmake.lua @@ -8,6 +8,10 @@ package("jwasm") add_versions("2025.01.10", "a5c4ea03cc0545a15d81a354251b5f534bef7a1b") on_install(function (package) + if package:is_plat("mingw", "msys") then + io.replace("memalloc.c", "#include ", "", {plain = true}) + end + io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") target("jwasm") @@ -15,7 +19,7 @@ package("jwasm") add_files("*.c|trmem.c") add_includedirs("H") add_defines("DEBUG_OUT") - if is_plat("windows", "mingw") then + if is_plat("windows", "mingw", "msys") then add_defines("__NT__") else add_defines("__UNIX__")