Ftxui cross

.github/workflows/android.yml

@@ -25,6 +25,7 @@ jobs:
         with:
           xmake-version: branch@master
           actions-cache-folder: '.xmake-cache'
+          actions-cache-key: 'android'
 
       - name: Prepare
         run: |

.github/workflows/fedora.yml

@@ -35,6 +35,7 @@ jobs:
         with:
           xmake-version: branch@master
           actions-cache-folder: '.xmake-cache'
+          actions-cache-key: 'fedora'
 
       - name: Tests
         env:

.github/workflows/freebsd.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macOS-12]
+        os: [ubuntu-latest]
         kind: [static, shared]
 
     runs-on: ${{ matrix.os }}
@@ -22,22 +22,22 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Tests
-        uses: vmactions/freebsd-vm@v0
+        uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
           sync: sshfs
           mem: 4096
           copyback: false
           prepare: pkg install -y git curl unzip gmake llvm gsed bash perl5 openssl
           run: |
+            git config --global --add safe.directory `pwd`
             git clone --recurse-submodules https://github.com/xmake-io/xmake.git /tmp/xmake -b dev
             cd /tmp/xmake
             ./configure
             gmake -j4
             gmake install
             export XMAKE_ROOT=y
             cd -
-            git config --global --add safe.directory /Users/runner/work/xmake-repo/xmake-repo
             xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} -vD
 
 

.github/workflows/ubuntu.yml

@@ -24,6 +24,7 @@ jobs:
         with:
           xmake-version: branch@master
           actions-cache-folder: '.xmake-cache'
+          actions-cache-key: 'ubuntu'
 
       - name: Installation
         run: |

.github/workflows/ubuntu_clang.yml

@@ -23,12 +23,13 @@ jobs:
         with:
           xmake-version: branch@master
           actions-cache-folder: '.xmake-cache'
+          actions-cache-key: 'ubuntu_clang'
 
       - name: Installation
         run: |
           # TODO we will remove it later
           sudo apt-get update
-          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev clang libc++-dev p7zip
+          sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev clang libomp-dev libc++-dev p7zip
 
       - name: Tests
         run: |

.github/workflows/wasm_ubuntu.yml

@@ -23,12 +23,13 @@ jobs:
         with:
           xmake-version: branch@master
           actions-cache-folder: '.xmake-cache'
+          actions-cache-key: 'wasm'
 
       - name: Prepare
         uses: mymindstorm/setup-emsdk@v11
         with:
           # Make sure to set a version number!
-          version: 3.1.28
+          version: 3.1.35
           # This is the name of the cache folder.
           # The cache folder will be placed in the build directory,
           #  so make sure it doesn't conflict with anything!

packages/a/abseil/xmake.lua

@@ -12,47 +12,54 @@ package("abseil")
     add_versions("20211102.0", "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4")
     add_versions("20220623.0", "4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602")
     add_versions("20230125.2", "9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906")
+    add_versions("20230802.1", "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed")
 
     add_deps("cmake")
 
-    add_links(
-        "absl_status", "absl_cord",
-        "absl_flags", "absl_flags_parse", "absl_flags_internal", "absl_flags_reflection", "absl_flags_marshalling",
-        "absl_flags_commandlineflag_internal", "absl_synchronization", "absl_time", "absl_hash", "absl_city", "absl_time_zone",
-        "absl_spinlock_wait", "absl_failure_signal_handler", "absl_bad_optional_access", "absl_flags_commandlineflag",
-        "absl_random_internal_pool_urbg",
-        "absl_cordz_info", "absl_cord_internal", "absl_cordz_functions", "absl_cordz_handle", "absl_cordz_sample_token",
-        "absl_base", "absl_bad_any_cast_impl", "absl_periodic_sampler", "absl_random_distributions",
-        "absl_flags_usage_internal", "absl_random_seed_sequences",
-        "absl_throw_delegate", "absl_stacktrace", "absl_symbolize", "absl_debugging_internal",
-        "absl_flags_private_handle_accessor",
-        "absl_strings", "absl_flags_config", "absl_malloc_internal", "absl_str_format_internal",
-        "absl_flags_usage", "absl_strings_internal", "absl_flags_program_name", "absl_int128",
-        "absl_scoped_set_env", "absl_raw_hash_set", "absl_random_internal_seed_material",
-        "absl_random_internal_randen", "absl_random_internal_randen_slow", "absl_random_internal_randen_hwaes_impl",
-        "absl_random_internal_randen_hwaes",
-        "absl_graphcycles_internal", "absl_exponential_biased", "absl_bad_variant_access", "absl_statusor",
-        "absl_random_internal_distribution_test_util", "absl_random_internal_platform",
-        "absl_hashtablez_sampler", "absl_demangle_internal", "absl_leak_check", "absl_log_severity", "absl_raw_logging_internal",
-        "absl_strerror", "absl_examine_stack", "absl_low_level_hash", "absl_random_seed_gen_exception", "absl_civil_time",
-        "absl_crc_cord_state", "absl_crc32c", "absl_crc_cpu_detect", "absl_crc_internal")
-
     if is_plat("macosx") then
         add_frameworks("CoreFoundation")
     end
 
     on_load(function (package)
         if package:is_plat("windows") and package:config("shared") then
             package:add("defines", "ABSL_CONSUME_DLL")
-            package:add("links", "abseil_dll")
         end
     end)
 
     on_install("macosx", "linux", "windows", "mingw", "cross", function (package)
+        if package:version() and package:version():eq("20230802.1") and package:is_plat("mingw") then
+            io.replace(path.join("absl", "synchronization", "internal", "pthread_waiter.h"), "#ifndef _WIN32", "#if !defined(_WIN32) && !defined(__MINGW32__)", {plain = true})
+            io.replace(path.join("absl", "synchronization", "internal", "win32_waiter.h"), "#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", "#if defined(_WIN32) && !defined(__MINGW32__) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", {plain = true})
+        end
         local configs = {"-DCMAKE_CXX_STANDARD=17"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         import("package.tools.cmake").install(package, configs, {buildir = os.tmpfile() .. ".dir"})
+
+        -- get links and ensure link order
+        import("core.base.graph")
+        local dag = graph.new(true)
+        local pkgconfigdir = package:installdir("lib", "pkgconfig")
+        for _, pcfile in ipairs(os.files(path.join(pkgconfigdir, "*.pc"))) do
+            local link = path.basename(pcfile)
+            local content = io.readfile(pcfile)
+            for _, line in ipairs(content:split("\n")) do
+                if line:startswith("Requires: ") then
+                    local requires = line:sub(10):split(",")
+                    for _, dep in ipairs(requires) do
+                        dep = dep:split("=")[1]:trim()
+                        dag:add_edge(link, dep)
+                    end
+                end
+            end
+        end
+        local links = dag:topological_sort()
+        package:add("links", links)
+
+        local cycle = dag:find_cycle()
+        if cycle then
+            wprint("cycle links found", cycle)
+        end
     end)
 
     on_test(function (package)
@@ -69,5 +76,5 @@ package("abseil")
                 auto a = absl::SimpleAtoi("123", &result);
                 std::cout << "Joined string: " << s << "\\n";
             }
-        ]]}, {configs = {languages = "c++17"}}))
+        ]]}, {configs = {languages = "cxx17"}}))
     end)

packages/a/alsa-lib/xmake.lua

@@ -1,26 +1,36 @@
 package("alsa-lib")
     set_homepage("https://alsa-project.org/wiki/Main_Page")
     set_description("The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system.")
+    set_license("LGPL-2.1")
 
-    set_urls("http://www.alsa-project.org/files/pub/lib/alsa-lib-$(version).tar.bz2")
+    add_urls("http://www.alsa-project.org/files/pub/lib/alsa-lib-$(version).tar.bz2", {alias = "home"})
+    add_urls("https://github.com/alsa-project/alsa-lib/archive/refs/tags/v$(version).tar.gz", {alias = "github"})
+    add_versions("home:1.2.10", "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e")
+    add_versions("github:1.2.10", "f55749847fd98274501f4691a2d847e89280c07d40a43cdac43d6443f69fc939")
 
-    add_versions("1.2.10", "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e")
+    add_configs("versioned", {description = "pass flag --without-versioned", default = true, type = "boolean"})
+
+    if is_plat("linux") then
+        add_extsources("pacman::alsa-lib", "apt::libasound2-dev")
+    end
+
+    if not is_plat("windows") then
+        add_deps("autoconf", "automake", "libtool", "m4")
+    end
 
     on_install("linux", function (package)
-        local configs = {"--without-versioned"}
+        local configs = {}
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         if package:is_debug() then
             table.insert(configs, "--enable-debug")
         end
+        if package:config("versioned")then
+            table.insert(configs, "--without-versioned")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 
     on_test(function (package)
-        assert(package:check_csnippets({test = [[
-            void test() {
-                snd_ctl_card_info_t *info;
-                snd_ctl_card_info_alloca(&info);
-            }
-        ]]}, {includes = {"alsa/asoundlib.h"}}))
+        assert(package:has_cfuncs("snd_pcm_open", {includes = "alsa/asoundlib.h"}))
     end)

packages/a/amqp-cpp/xmake.lua

@@ -0,0 +1,43 @@
+package("amqp-cpp")
+    set_homepage("https://github.com/CopernicaMarketingSoftware/AMQP-CPP")
+    set_description("C++ library for asynchronous non-blocking communication with RabbitMQ")
+    set_license("Apache-2.0")
+
+    add_urls("https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/CopernicaMarketingSoftware/AMQP-CPP.git")
+
+    add_versions("v4.3.26", "2baaab702f3fd9cce40563dc1e23f433cceee7ec3553bd529a98b1d3d7f7911c")
+
+    if is_plat("windows", "mingw") then
+        add_syslinks("ws2_32")
+    elseif is_plat("linux") then
+        add_configs("tcp", {description = "Build TCP module.", default = false, type = "boolean"})
+        add_syslinks("pthread", "dl")
+    end
+
+    add_deps("cmake")
+
+    on_install(function (package)
+        local configs = {}
+        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"))
+        if package:is_plat("windows") then
+            package:add("defines", "NOMINMAX")
+            if package:config("shared") and package:version():le("4.3.26") then
+                table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON")
+            end
+        elseif package:is_plat("linux") then
+            table.insert(configs, "-DAMQP-CPP_LINUX_TCP=" .. (package:config("tcp") and "ON" or "OFF"))
+        end
+        import("package.tools.cmake").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:check_cxxsnippets({test = [[
+            #include <amqpcpp.h>
+            void test() {
+                AMQP::Connection connection(nullptr, AMQP::Login("guest","guest"), "/");
+                AMQP::Channel channel(nullptr);
+            }
+        ]]}, {configs = {languages = "c++17"}}))
+    end)

packages/a/arduinojson/xmake.lua

@@ -0,0 +1,27 @@
+package("arduinojson")
+    set_kind("library", {headeronly = true})
+    set_homepage("https://arduinojson.org")
+    set_description("📟 JSON library for Arduino and embedded C++. Simple and efficient.")
+    set_license("MIT")
+
+    add_urls("https://github.com/bblanchon/ArduinoJson/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/bblanchon/ArduinoJson.git")
+
+    add_versions("v6.21.4", "9551af9282372f6e64cf4009fc43be7f2df6eb96fe9c0aab44d4eed217d09747")
+
+    add_deps("cmake")
+
+    on_install(function (package)
+        import("package.tools.cmake").install(package, {"-DBUILD_TESTING=OFF"})
+    end)
+
+    on_test(function (package)
+        assert(package:check_cxxsnippets({test = [[
+            #include <ArduinoJson.h>
+            void test() {
+                char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
+                DynamicJsonDocument doc(1024);
+                deserializeJson(doc, json);
+            }
+        ]]}, {configs = {languages = "c++11"}}))
+    end)

packages/a/asio2/xmake.lua

@@ -0,0 +1,25 @@
+package("asio2")
+
+    set_kind("library", {headeronly = true})
+    set_homepage("https://github.com/zhllxt/asio2")
+    set_description("Header only c++ network library, based on asio, support tcp,udp,http,websocket,rpc,ssl,icmp,serial_port.")
+    set_license("BSL-1.0")
+
+    add_urls("https://github.com/zhllxt/asio2.git")
+    add_versions("2023.05.09", "ac8c79964d79020091e38fcbb4ae9dccccb3b03c")
+
+    add_deps("asio", "cereal", "fmt", "openssl3")
+    add_deps("spdlog", { configs = { header_only = false, fmt_external = true } })
+
+    on_install("windows", "linux", "macosx", "mingw", "bsd", function (package)
+        os.cp(path.join("include", "*"), package:installdir("include"))
+    end)
+
+    on_test(function (package)
+        assert(package:check_cxxsnippets({test = [[
+            #include <asio2/asio2.hpp>
+            void test() {
+                asio2::tcp_server server;
+            }
+        ]]}, {configs = {languages = "c++17"}}))
+    end)

packages/a/asio3/xmake.lua

@@ -0,0 +1,26 @@
+package("asio3")
+    set_kind("library", {headeronly = true})
+    set_homepage("https://github.com/zhllxt/asio3")
+    set_description("Header only c++ network library, based on c++ 20 coroutine and asio")
+    set_license("BSL-1.0")
+
+    add_urls("https://github.com/zhllxt/asio3.git")
+    add_versions("2023.12.03", "66e76da69b359540fdf15b85bd5f3612b358c1da")
+
+    add_deps("asio", "cereal", "fmt", "openssl3", "nlohmann_json")
+    add_deps("spdlog", { configs = { header_only = false, fmt_external = true } })
+
+    on_install("windows", "linux", "macosx", "mingw", "bsd", function (package)
+        os.cp(path.join("include"), package:installdir())
+    end)
+
+    on_test(function (package)
+        assert(package:check_cxxsnippets({test = [[
+            #include <asio3/tcp/tcp_client.hpp>
+            namespace net = ::asio;
+            void test() {
+                net::io_context ctx;
+	            net::tcp_client client(ctx.get_executor());
+            }
+        ]]}, {configs = {languages = "c++23"}}))
+    end)

packages/a/assimp/xmake.lua

@@ -99,36 +99,29 @@ package("assimp")
             table.insert(configs, "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF")
         end
 
-        if not package:gitref() and package:version():lt("v5.2.4") then
-            -- ASSIMP_WARNINGS_AS_ERRORS is not supported before v5.2.4
+        -- ASSIMP_WARNINGS_AS_ERRORS maybe does not work for some old versions
+        for _, cmakefile in ipairs(table.join("CMakeLists.txt", os.files("**/CMakeLists.txt"))) do
             if package:is_plat("windows") then
-                io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE /W4 /WX)", "", {plain = true})
+                io.replace(cmakefile, "/W4 /WX", "", {plain = true})
             else
-                io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)", "", {plain = true})
+                io.replace(cmakefile, "-Werror", "", {plain = true})
             end
         end
-        if not package:gitref() and package:version():eq("v5.2.5") then
-            -- Remove /WX from CMakeLists for MSVC: https://github.com/assimp/assimp/pull/5183
-            io.replace("CMakeLists.txt", "ADD_COMPILE_OPTIONS(/bigobj /W4 /WX )", "ADD_COMPILE_OPTIONS(/bigobj)", {plain = true})
-            io.replace("CMakeLists.txt", "ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX)", "ADD_COMPILE_OPTIONS(/MP /bigobj)", {plain = true})
+        -- fix cmake_install failed
+        if not package:gitref() and package:version():ge("v5.3.0") and package:is_plat("windows") and package:is_debug() then
+            io.replace("code/CMakeLists.txt", "IF(GENERATOR_IS_MULTI_CONFIG)", "IF(TRUE)", {plain = true})
         end
         if package:is_plat("mingw") and package:version():lt("v5.1.5") then
             -- CMAKE_COMPILER_IS_MINGW has been removed: https://github.com/assimp/assimp/pull/4311
             io.replace("CMakeLists.txt", "CMAKE_COMPILER_IS_MINGW", "MINGW", {plain = true})
         end
 
         -- Assimp CMakeLists doesn't find minizip on Windows
-        local ldflags
+        local packagedeps
         if package:is_plat("windows") then
             local minizip = package:dep("minizip")
             if minizip and not minizip:is_system() then
-                local fetchinfo = minizip:fetch({external = false})
-                if fetchinfo then
-                    ldflags = {}
-                    for _, linkdir in ipairs(fetchinfo.linkdirs) do
-                        table.insert(ldflags, "/LIBPATH:" .. linkdir:gsub("\\", "/"))
-                    end
-                end
+                packagedeps = table.join2(packagedeps or {}, "minizip")
             end
         end
 
@@ -147,7 +140,7 @@ package("assimp")
             end
         end
 
-        import("package.tools.cmake").install(package, configs, {ldflags = ldflags, shflags = ldflags})
+        import("package.tools.cmake").install(package, configs, {packagedeps = packagedeps})
 
         -- copy pdb
         if package:is_plat("windows") then