From 8bcc6de9b21d17b5305c65f40380798b7d54d109 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Wed, 8 Nov 2023 14:58:04 +0800 Subject: [PATCH] [49_10] Upgrade xmake to 2.8.5 on linux and macosx --- .github/workflows/cd_draw_mogan_app.yml | 2 +- .github/workflows/cd_research_mogan_app.yml | 2 +- .github/workflows/cd_research_on_macos.yml | 2 +- .github/workflows/cd_research_on_mingw.yml | 2 +- .../workflows/cd_research_on_ubuntu_20_04.yml | 2 +- .../workflows/cd_research_on_ubuntu_22_04.yml | 2 +- .github/workflows/ci-xmake-macos.yml | 2 +- .github/workflows/ci-xmake-mingw.yml | 2 +- .github/workflows/ci-xmake-ubuntu.yml | 2 +- .github/workflows/ci-xmake-wasm.yml | 2 +- xmake.lua | 16 ++++++++++++---- xmake/packages.lua | 6 +++--- xmake/research.lua | 2 +- 13 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cd_draw_mogan_app.yml b/.github/workflows/cd_draw_mogan_app.yml index 1ceee01402..d8f04aca25 100644 --- a/.github/workflows/cd_draw_mogan_app.yml +++ b/.github/workflows/cd_draw_mogan_app.yml @@ -32,7 +32,7 @@ jobs: elvish-version: 0.19.2 - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 - name: update repo run: | xrepo update-repo diff --git a/.github/workflows/cd_research_mogan_app.yml b/.github/workflows/cd_research_mogan_app.yml index 27990037f1..ba2e31d10c 100644 --- a/.github/workflows/cd_research_mogan_app.yml +++ b/.github/workflows/cd_research_mogan_app.yml @@ -23,7 +23,7 @@ jobs: elvish-version: 0.19.2 - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 - name: update repo run: | xrepo update-repo diff --git a/.github/workflows/cd_research_on_macos.yml b/.github/workflows/cd_research_on_macos.yml index c7075b6a98..aafb82c928 100644 --- a/.github/workflows/cd_research_on_macos.yml +++ b/.github/workflows/cd_research_on_macos.yml @@ -22,7 +22,7 @@ jobs: cache: 'true' - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 actions-cache-folder: '.xmake-cache' - name: xmake repo --update run: xmake repo --update diff --git a/.github/workflows/cd_research_on_mingw.yml b/.github/workflows/cd_research_on_mingw.yml index eb64145996..1122c44bac 100644 --- a/.github/workflows/cd_research_on_mingw.yml +++ b/.github/workflows/cd_research_on_mingw.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 - name: update repo run: | xrepo update-repo diff --git a/.github/workflows/cd_research_on_ubuntu_20_04.yml b/.github/workflows/cd_research_on_ubuntu_20_04.yml index d43d3c771a..a024d2765e 100644 --- a/.github/workflows/cd_research_on_ubuntu_20_04.yml +++ b/.github/workflows/cd_research_on_ubuntu_20_04.yml @@ -27,7 +27,7 @@ jobs: fetch-depth: 1 - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 actions-cache-folder: ${{ matrix.ubuntu_ver }}-xmake-cache - name: Write release version run: | diff --git a/.github/workflows/cd_research_on_ubuntu_22_04.yml b/.github/workflows/cd_research_on_ubuntu_22_04.yml index 1723f3cfb6..1dc9e26360 100644 --- a/.github/workflows/cd_research_on_ubuntu_22_04.yml +++ b/.github/workflows/cd_research_on_ubuntu_22_04.yml @@ -27,7 +27,7 @@ jobs: fetch-depth: 1 - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 actions-cache-folder: ${{ matrix.ubuntu_ver }}-xmake-cache - name: Write release version run: | diff --git a/.github/workflows/ci-xmake-macos.yml b/.github/workflows/ci-xmake-macos.yml index ccac6b63f3..19ed57d9e1 100644 --- a/.github/workflows/ci-xmake-macos.yml +++ b/.github/workflows/ci-xmake-macos.yml @@ -50,7 +50,7 @@ jobs: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 actions-cache-folder: '.xmake-cache' - name: xmake repo --update diff --git a/.github/workflows/ci-xmake-mingw.yml b/.github/workflows/ci-xmake-mingw.yml index e45f42cdd5..9d8133e42f 100644 --- a/.github/workflows/ci-xmake-mingw.yml +++ b/.github/workflows/ci-xmake-mingw.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 - name: update repo run: | xrepo update-repo diff --git a/.github/workflows/ci-xmake-ubuntu.yml b/.github/workflows/ci-xmake-ubuntu.yml index 72d6653713..f74b137554 100644 --- a/.github/workflows/ci-xmake-ubuntu.yml +++ b/.github/workflows/ci-xmake-ubuntu.yml @@ -54,7 +54,7 @@ jobs: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 actions-cache-folder: '.xmake-cache' - name: xmake repo --update diff --git a/.github/workflows/ci-xmake-wasm.yml b/.github/workflows/ci-xmake-wasm.yml index 0a03116719..3ebc02e261 100644 --- a/.github/workflows/ci-xmake-wasm.yml +++ b/.github/workflows/ci-xmake-wasm.yml @@ -35,7 +35,7 @@ jobs: elvish-version: 0.19.2 - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.8.3 + xmake-version: v2.8.5 - name: update repo run: | xrepo update-repo diff --git a/xmake.lua b/xmake.lua index 630c316e31..25cb7e3fff 100644 --- a/xmake.lua +++ b/xmake.lua @@ -9,12 +9,20 @@ -- It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE -- in the root directory or . -set_xmakever("2.8.3") +if is_plat("windows") then + set_xmakever("2.8.3") +else + set_xmakever("2.8.5") +end -- Check CXX Types/Includes/Funcs -includes("check_cxxtypes.lua") -includes("check_cxxincludes.lua") -includes("check_cxxfuncs.lua") +if is_plat("windows") then + includes("check_cxxtypes.lua") + includes("check_cxxincludes.lua") + includes("check_cxxfuncs.lua") +else + includes("@builtin/check") +end configvar_check_cxxincludes("HAVE_UNISTD_H", "unistd.h") configvar_check_cxxtypes("HAVE_INTPTR_T", "intptr_t", {includes = {"memory"}}) diff --git a/xmake/packages.lua b/xmake/packages.lua index a7caf67d19..8b77a8d3b7 100644 --- a/xmake/packages.lua +++ b/xmake/packages.lua @@ -19,8 +19,8 @@ -- [ ] portage powered -- ... -local LOLLY_VERSION = "1.2.19" -local TBOX_VERSION = "dev" +local LOLLY_VERSION = "1.3.1" +local TBOX_VERSION = "1.7.5" local CPR_VERSION = "1.10.5" local CURL_VERSION = "8.4.0" local PDFHUMMUS_VERSION = "4.6.1" @@ -38,7 +38,7 @@ package("lolly") add_deps("cpr") end - add_versions("v" .. LOLLY_VERSION, "6201b1745e529cf8189b34588a75b36fd8070830") + add_versions("v" .. LOLLY_VERSION, "e160a5a29b29470bd51bbb48469cc0fa530e13e8") on_install("linux", "macosx", "mingw", "wasm", "windows", function (package) local configs = {} diff --git a/xmake/research.lua b/xmake/research.lua index 6c390adcfb..a6c3d6557b 100644 --- a/xmake/research.lua +++ b/xmake/research.lua @@ -103,7 +103,7 @@ function add_target_research_on_others() add_packages("lolly") if is_plat("mingw", "windows") then - add_packages("qt5widgets") + add_packages("qt6widgets") end add_deps("libmogan")