From cde688f2021845a23751eeb25aecd3b5194c6952 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 4 Oct 2025 17:39:12 +0800
Subject: fix os.getenvs compat

---
 xmake/core/base/os.lua | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'xmake/core')

diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 988d9e4bf..8f56aa8e0 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -42,6 +42,7 @@ os._tmpdir   = os._tmpdir or os.tmpdir
 os._curdir   = os._curdir or os.curdir
 os._fscase   = os._fscase or os.fscase
 os._setenv   = os._setenv or os.setenv
+os._getenvs  = os._getenvs or os.getenvs
 os._cpuinfo  = os._cpuinfo or os.cpuinfo
 os._meminfo  = os._meminfo or os.meminfo
 os._readlink = os._readlink or os.readlink
@@ -1300,6 +1301,33 @@ function os.term()
     return require("base/tty").term()
 end
 
+-- get all current environments variables
+function os.getenvs()
+    local envs = os._getenvs()
+    if envs then
+        if envs[1] ~= nil then
+            local result = {}
+            for _, line in ipairs(envs) do
+                local p = line:find('=', 1, true)
+                if p then
+                    local key = line:sub(1, p - 1):trim()
+                    -- only translate Path to PATH on windows
+                    -- @see https://github.com/xmake-io/xmake/issues/3752
+                    if os.host() == "windows" and key:lower() == "path" then
+                        key = key:upper()
+                    end
+                    local values = line:sub(p + 1):trim()
+                    if #key > 0 then
+                        result[key] = values
+                    end
+                end
+            end
+            envs = result
+        end
+    end
+    return envs
+end
+
 -- set all current environment variables
 -- e.g. envs["PATH"] = "/xxx:/yyy/foo"
 function os.setenvs(envs)
-- 
cgit v1.3.1


From d31622c8fb0c962262f3397bc8cb1ac670abd001 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 4 Oct 2025 18:01:37 +0800
Subject: improve hash

---
 xmake/core/base/hash.lua | 11 ++++++++---
 xmake/core/base/os.lua   |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'xmake/core')

diff --git a/xmake/core/base/hash.lua b/xmake/core/base/hash.lua
index e846ba302..9d7ca40ed 100644
--- a/xmake/core/base/hash.lua
+++ b/xmake/core/base/hash.lua
@@ -120,9 +120,14 @@ end
 
 -- generate hash32 from string, e.g. "91e8ecf1"
 function hash.strhash32(str)
-    local data = libc.ptraddr(libc.dataptr(str))
-    local size = #str
-    return hash._xxhash(32, data, size)
+    if hash._rand32 then
+        local data = libc.ptraddr(libc.dataptr(str))
+        local size = #str
+        return hash._xxhash(32, data, size)
+    else
+        -- we need to be compatible with the old binary core (<= v3.0.3)
+        return hash.uuid4(str):split("-", {plain = true})[1]:lower()
+    end
 end
 
 -- generate hash64 from string, e.g. "91e8ecf191e8ecf1"
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 8f56aa8e0..e6422c549 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -1305,6 +1305,7 @@ end
 function os.getenvs()
     local envs = os._getenvs()
     if envs then
+        -- we need to be compatible with the old binary core, if it's array (<= v3.0.3)
         if envs[1] ~= nil then
             local result = {}
             for _, line in ipairs(envs) do
-- 
cgit v1.3.1