[49_10] Upgrade xmake to 2.8.5 on linux and macosx

XmacsLabs · Nov 8, 2023 · 8bcc6de · 8bcc6de
1 parent e4d1a0d
commit 8bcc6de
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,12 +9,20 @@
 -- It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE
 -- in the root directory or <http://www.gnu.org/licenses/gpl-3.0.html>.
 
-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
@@ -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
@@ -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")