From 33523ce125c9cc284ce796692b75212f2c1da115 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 7 Feb 2025 20:10:37 +0800 Subject: [PATCH 1/3] Update ada to v3.0.1 --- packages/a/ada/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/ada/xmake.lua b/packages/a/ada/xmake.lua index 62f304c0f0a..f80169af58f 100644 --- a/packages/a/ada/xmake.lua +++ b/packages/a/ada/xmake.lua @@ -6,6 +6,7 @@ package("ada") set_urls("https://github.com/ada-url/ada/archive/refs/tags/$(version).tar.gz", "https://github.com/ada-url/ada.git") + add_versions("v3.0.1", "525890a87a002b1cc14c091800c53dcf4a24746dbfc5e3b8a9c80490daad9263") add_versions("v2.9.2", "f41575ad7eec833afd9f6a0d6101ee7dc2f947fdf19ae8f1b54a71d59f4ba5ec") add_versions("v2.9.1", "64eb3d91db941645d1b68ac8d1cbb7b534fbe446b66c1da11e384e17fca975e7") add_versions("v2.9.0", "8b992f0ce9134cb4eafb74b164d2ce2cb3af1900902162713b0e0c5ab0b6acd8") From 34899e91245a404b91a4bd9d9e9b2f354d4ed1d6 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 7 Feb 2025 20:29:26 +0800 Subject: [PATCH 2/3] Update xmake.lua --- packages/a/ada/xmake.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/a/ada/xmake.lua b/packages/a/ada/xmake.lua index f80169af58f..9417975a47c 100644 --- a/packages/a/ada/xmake.lua +++ b/packages/a/ada/xmake.lua @@ -30,17 +30,27 @@ package("ada") io.replace("CMakeLists.txt", "add_subdirectory(singleheader)", "", {plain = true}) io.replace("CMakeLists.txt", "add_subdirectory(tools)", "", {plain = true}) + io.replace("src/CMakeLists.txt", "/WX", "", {plain = true}) + local configs = {"-DBUILD_TESTING=OFF", "-DADA_TOOLS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DADA_SANITIZE=" .. (package:config("asan") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) + local languages + if package:version() and package:version():ge("3.0.0") then + languages = "c++20" + else + languages = "c++17" + end assert(package:check_cxxsnippets({test = [[ + #include #include void test() { auto url = ada::parse("https://xmake.io"); } - ]]}, {configs = {languages = "c++17"}})) + ]]}, {configs = {languages = languages}})) end) From b243bc6ded5aee5d856195b6a968a29172f92bf5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 7 Feb 2025 22:56:48 +0800 Subject: [PATCH 3/3] Update xmake.lua --- packages/a/ada/xmake.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/a/ada/xmake.lua b/packages/a/ada/xmake.lua index 9417975a47c..fc4f759b89e 100644 --- a/packages/a/ada/xmake.lua +++ b/packages/a/ada/xmake.lua @@ -26,6 +26,15 @@ package("ada") add_deps("cmake") + if on_check then + on_check("android", function (package) + if package:version() and package:version():ge("3.0.0") then + local ndk = package:toolchain("ndk"):config("ndkver") + assert(ndk and tonumber(ndk) > 22, "package(ada >=3.0.0) require ndk version > 22") + end + end) + end + on_install(function (package) io.replace("CMakeLists.txt", "add_subdirectory(singleheader)", "", {plain = true}) io.replace("CMakeLists.txt", "add_subdirectory(tools)", "", {plain = true})