From 9f87b9f5f5ddd52a1f1198904a3b8c4dbb4576a0 Mon Sep 17 00:00:00 2001 From: Opportunity Date: Fri, 10 Apr 2026 14:43:27 +0800 Subject: feat: 支持 XMAKE_STATS=n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xmake/modules/private/utils/statistics.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/private/utils/statistics.lua b/xmake/modules/private/utils/statistics.lua index 4672f4d82..e779c28cc 100644 --- a/xmake/modules/private/utils/statistics.lua +++ b/xmake/modules/private/utils/statistics.lua @@ -32,7 +32,7 @@ function _is_enabled() -- disable statistics? need not post it local stats = (os.getenv("XMAKE_STATS") or ""):lower() - if stats == "false" then + if stats == "false" or stats == 'n' then return false end -- cgit v1.3.1 From 023b573d3117f1381dce5c92a261a6d831fee996 Mon Sep 17 00:00:00 2001 From: Opportunity Date: Fri, 10 Apr 2026 17:15:36 +0800 Subject: feat: 支持 XMAKE_STATS=n/no MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xmake/modules/private/utils/statistics.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/private/utils/statistics.lua b/xmake/modules/private/utils/statistics.lua index e779c28cc..990d9f7b7 100644 --- a/xmake/modules/private/utils/statistics.lua +++ b/xmake/modules/private/utils/statistics.lua @@ -32,7 +32,7 @@ function _is_enabled() -- disable statistics? need not post it local stats = (os.getenv("XMAKE_STATS") or ""):lower() - if stats == "false" or stats == 'n' then + if option.boolean(stats) == false then return false end -- cgit v1.3.1 From 3a821a9fe58b4901db1fc96db810bc7d50b73049 Mon Sep 17 00:00:00 2001 From: Opportunity Date: Fri, 10 Apr 2026 17:26:32 +0800 Subject: feat: 支持 XMAKE_ROOT=yes/true MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xmake/core/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/core/main.lua b/xmake/core/main.lua index 1c51342b9..f3ad904f5 100644 --- a/xmake/core/main.lua +++ b/xmake/core/main.lua @@ -258,7 +258,7 @@ end -- limit root? @see https://github.com/xmake-io/xmake/pull/4513 function main._limit_root() - return not option.get("root") and os.getenv("XMAKE_ROOT") ~= 'y' and os.host() ~= 'haiku' + return not option.get("root") and option.boolean(os.getenv("XMAKE_ROOT")) ~= true and os.host() ~= 'haiku' end -- run task -- cgit v1.3.1 From 39f685415d4398e3896a3f131f09902055457ce0 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 10 Apr 2026 23:10:59 +0800 Subject: Update xpack.lua --- core/xpack.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/xpack.lua b/core/xpack.lua index a0288004a..0be853bc9 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -40,15 +40,14 @@ xpack("xmake") else local arch = package:arch() local url_7z = "https://github.com/xmake-mirror/7zip/releases/download/24.08/7z24.08-" .. arch .. ".zip" - local curl_version = "8.19.0_6" - local curl_version_win32 = "8.14.1_1" + local curl_baseurl = "https://github.com/xmake-mirror/curl/releases/download/curl-8_19_0/curl-8.19.0_6" local url_curl if package:is_arch("x64", "x86_64") then - url_curl = "https://curl.se/windows/dl-" .. curl_version .. "/curl-" .. curl_version .. "-win64-mingw.zip" + url_curl = curl_baseurl .. "-win64-mingw.zip" elseif package:is_arch("arm64") then - url_curl = "https://curl.se/windows/dl-" .. curl_version .. "/curl-" .. curl_version .. "-win64a-mingw.zip" + url_curl = curl_baseurl .. "-win64a-mingw.zip" else - url_curl = "https://curl.se/windows/dl-" .. curl_version_win32 .. "/curl-" .. curl_version_win32 .. "-win32-mingw.zip" + url_curl = curl_baseurl .. "-win32.zip" end local archive_7z = path.join(package:builddir(), "7z.zip") local archive_curl = path.join(package:builddir(), "curl.zip") -- cgit v1.3.1