Add parse_pe function to check for PE headers and enhance os.isexec for Windows

2 files changed, 32 insertions, 2 deletions

diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 963a015c1..33a073773 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -1158,15 +1158,38 @@ function os.isexec(filepath)
     if os.isfile(filepath) then
         if os.host() == "windows" then
             local ext = path.extension(filepath):lower()
-            if ext == ".exe" or ext == ".cmd" or ext == ".bat" then
+            if ext == ".exe" or ext == ".cmd" or ext == ".bat" or ext == ".ps1" then
                 return true
             end
+            -- check for PE header
+            local peinfo = io.parse_pe(filepath)
+            if peinfo then
+                local pe_arch = peinfo.arch
+                -- x64 or x86
+                if pe_arch == "x86" or pe_arch == "x64" and os.is_arch("x86_64") then
+                    return true
+                else
+                    return false
+                end
+                -- arm64
+                if pe_arch == "arm64" and os.is_arch("arm64") then
+                    return true
+                else
+                    return false
+                end
+                -- arm32
+                if pe_arch == "arm" and os.is_arch("arm.*") then
+                    return true
+                else
+                    return false
+                end
+            end
         else
             return os._access(filepath, "x")
         end
     end
     if os.host() == "windows" then
-        for _, suffix in ipairs({".exe", ".cmd", ".bat"}) do
+        for _, suffix in ipairs({".exe", ".cmd", ".bat", ".ps1"}) do
             if os.isfile(filepath .. suffix) then
                 return true
             end
diff --git a/xmake/core/sandbox/modules/io.lua b/xmake/core/sandbox/modules/io.lua
index 0cafaa5f2..5657d02b9 100644
--- a/xmake/core/sandbox/modules/io.lua
+++ b/xmake/core/sandbox/modules/io.lua
@@ -372,6 +372,13 @@ function sandbox_io.tail(filepath, linecount, opt)
     io.tail(filepath, linecount, opt)
 end
 
+-- parse pe
+function sandbox_io.parse_pe(filepath)
+    assert(filepath)
+    filepath = vformat(filepath)
+    return io.parse_pe(filepath)
+end
+
 -- lazy loading stdfile
 setmetatable(sandbox_io, { __index = function (tbl, key)
         local val = rawget(tbl, key)