Merge pull request #5254 from xmake-io/7z

update 7z
xmake-io · Jun 25, 2024 · 938a4c6 · 938a4c6
2 parents 9c8a092 + 795ee10
commit 938a4c6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/core/xpack.lua b/core/xpack.lua
@@ -39,8 +39,16 @@ xpack("xmake")
                 package:add("installfiles", path.join(winenv, "**"), {rootdir = path.directory(winenv)})
             else
                 local arch = package:arch()
-                local url_7z = "https://github.com/xmake-mirror/7zip/releases/download/19.00/7z19.00-" .. arch .. ".zip"
-                local url_curl = "https://curl.se/windows/dl-8.2.1_11/curl-8.2.1_11-win32-mingw.zip"
+                local url_7z = "https://github.com/xmake-mirror/7zip/releases/download/24.07/7z24.07-" .. arch .. ".zip"
+                local curl_version = "8.8.0_2"
+                local url_curl = "https://curl.se/windows/dl-" .. curl_version .. "/curl-" .. curl_version
+                if package:is_arch("x64", "x86_64") then
+                    url_curl = url_curl .. "-win64-mingw.zip"
+                elseif package:is_arch("arm64") then
+                    url_curl = url_curl .. "-win64a-mingw.zip"
+                else
+                    url_curl = url_curl .. "-win32-mingw.zip"
+                end
                 local archive_7z = path.join(package:buildir(), "7z.zip")
                 local archive_curl = path.join(package:buildir(), "curl.zip")
                 local tmpdir_7z = path.join(package:buildir(), "7z")