Merge branch 'dev' into unitybuild

waruqi · web-flow · commit 2f8decdc353f · 2025-05-17T22:08:31.000+08:00
diff --git a/tests/projects/python/cython/example/src/example.py b/tests/projects/python/cython/example/src/example.py
@@ -0,0 +1 @@
+print("Hello, world!")
diff --git a/tests/projects/python/cython/example/xmake.lua b/tests/projects/python/cython/example/xmake.lua
@@ -0,0 +1,7 @@
+add_rules("mode.debug", "mode.release")
+add_requires("python 3.x")
+
+target("example")
+    add_rules("python.cython")
+    add_files("src/*.py")
+    add_packages("python")
diff --git a/tests/projects/python/pybind/example/src/example.cpp b/tests/projects/python/pybind/example/src/example.cpp
diff --git a/tests/projects/python/pybind/example/xmake.lua b/tests/projects/python/pybind/example/xmake.lua
@@ -2,7 +2,7 @@ add_rules("mode.release", "mode.debug")
 add_requires("pybind11")
 
 target("example")
-    add_rules("python.library", {soabi = true})
+    add_rules("python.module", {soabi = false})
     add_files("src/*.cpp")
     add_packages("pybind11")
     set_languages("c++11")
diff --git a/tests/projects/python/pybind/example_with_soabi/src/example.cpp b/tests/projects/python/pybind/example_with_soabi/src/example.cpp
diff --git a/tests/projects/python/pybind/example_with_soabi/xmake.lua b/tests/projects/python/pybind/example_with_soabi/xmake.lua
@@ -2,7 +2,7 @@ add_rules("mode.release", "mode.debug")
 add_requires("pybind11")
 
 target("example")
-    add_rules("python.library")
+    add_rules("python.module")
     add_files("src/*.cpp")
     add_packages("pybind11")
     set_languages("c++11")
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
@@ -1793,7 +1793,7 @@ function interpreter:api_builtin_includes(...)
                 files = os.files(subpath)
             else
                 -- @see https://github.com/xmake-io/xmake/issues/6026
-                files = os.files(path.join(subpath, path.filename(curfile)))
+                files = os.files(path.join(subpath, "xmake.lua"))
             end
             if files and #files > 0 then
                 table.join2(subpaths_matched, files)
diff --git a/xmake/core/base/profiler.lua b/xmake/core/base/profiler.lua
@@ -182,14 +182,20 @@ function profiler:stop()
             return a.totaltime > b.totaltime
         end)
 
-        -- show reports
+        -- show and save reports
+        local report_lines = ""
+        local outfile = path.join(os.tmpdir(), "perf-call-" .. os.date("%d-%m-%y-%S-%M-%H") .. ".log")
         for _, report in ipairs(reports) do
             local percent = (report.totaltime / totaltime) * 100
             if percent < 1 then
                 break
             end
-            utils.print("%6.3f, %6.2f%%, %7d, %s", report.totaltime, percent, report.callcount, self:_func_title(report.funcinfo))
+            local report_line = string.format("%6.3f, %6.2f%%, %7d, %s", report.totaltime, percent, report.callcount, self:_func_title(report.funcinfo))
+            report_lines = report_lines .. report_line .. "\n"
+            utils.print(report_line)
         end
+        utils.print("full log written to %s", outfile)
+        io.writefile(outfile, report_lines)
     elseif self:is_perf("tag") then
 
         -- sort reports, topN
@@ -201,16 +207,27 @@ function profiler:stop()
             h:push(report)
         end
 
-        -- show reports
+        -- show and save reports
         local count = 0
-        while count < 64 and h:length() > 0 do
+        local max_count = 64
+        local outfile = path.join(os.tmpdir(), "perf-tag-" .. os.date("%d-%m-%y-%S-%M-%H") .. ".log")
+        local report_lines = ""
+        while h:length() > 0 do
             local report = h:pop()
-            utils.print("%6.3f, %7d, %s", report.totaltime, report.callcount, self:_tag_title(report.name, report.argv))
+            local report_line = string.format("%6.3f, %7d, %s", report.totaltime, report.callcount, self:_tag_title(report.name, report.argv))
+            report_lines = report_lines .. report_line .. "\n"
             count = count + 1
         end
-        if h:length() > 0 then
+        if count <= max_count then
+            utils.print(report_lines)
+        elseif count > max_count then
+            local max_count_lines = {table.unpack(report_lines:split("\n"), 1, max_count)}
+            utils.print(table.concat(max_count_lines, "\n"))
             utils.print("...")
+            count = count + 1
         end
+        utils.print("full log written to %s", outfile)
+        io.writefile(outfile, report_lines)
    end
 end
 
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua
@@ -141,7 +141,13 @@ function _find_sdkdir(sdkdir, sdkver)
         -- @see https://github.com/xmake-io/xmake/issues/4881
         if sdkver then
             local major = sdkver:sub(1, 1)
-            qmake = find_file("qmake" .. major, paths, {suffixes = subdirs})
+            local suffixes = {major, "-" .. major, "-qt" .. major, ""}
+            for _, suffix in ipairs(suffixes) do
+                qmake = find_file("qmake" .. suffix, paths, {suffixes = subdirs})
+                if qmake then
+                    break
+                end
+            end
         end
         if not qmake then
             qmake = find_file("qmake", paths, {suffixes = subdirs})
@@ -167,18 +173,25 @@ function _find_qmake(sdkdir, sdkver)
     if sdkver then
         sdkver = semver.try_parse(sdkver)
         if sdkver then
-            local cachekey = "qmake-" .. sdkver:major()
-            qmake = find_tool("qmake", {program = "qmake" .. sdkver:major(), cachekey = cachekey, paths = sdkdir and path.join(sdkdir, "bin")})
+            local major = sdkver:major()
+            local suffixes = {major, "-" .. major, "-qt" .. major}
+            for _, suffix in ipairs(suffixes) do
+                local cachekey = "qmake" .. suffix
+                qmake = find_tool("qmake", {program = cachekey, cachekey = cachekey, paths = sdkdir and path.join(sdkdir, "bin")})
+                if qmake then
+                    break
+                end
+            end
         end
     end
 
     -- we need to find the default qmake in current system
     -- maybe we only installed qmake6
     if not qmake then
-        local suffixes = {"", "6", "-qt5"}
+        local suffixes = {"", "6", "-6", "-qt6", "5", "-5", "-qt5"}
         for _, suffix in ipairs(suffixes) do
-            local cachekey = "qmake-" .. suffix
-            qmake = find_tool("qmake", {program = "qmake" .. suffix, cachekey = cachekey, paths = sdkdir and path.join(sdkdir, "bin")})
+            local cachekey = "qmake" .. suffix
+            qmake = find_tool("qmake", {program = cachekey, cachekey = cachekey, paths = sdkdir and path.join(sdkdir, "bin")})
             if qmake then
                 break
             end
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua
@@ -109,11 +109,9 @@ function find_build_tools(opt)
     end
 
     local variables = {}
-    local VCToolsVersion
-    local vs_toolset = opt.vs_toolset
-    if vs_toolset and os.isdir(path.join(sdkdir, "VC/Tools/MSVC", vs_toolset)) then
-        VCToolsVersion = vs_toolset
-    else
+    local VCInstallDir = path.join(sdkdir, "VC")
+    local VCToolsVersion = opt.vs_toolset
+    if not VCToolsVersion or not os.isdir(path.join(VCInstallDir, "Tools/MSVC", VCToolsVersion)) then
         -- https://github.com/xmake-io/xmake/issues/6159
         local latest_toolset
         for _, dir in ipairs(os.dirs(path.join(sdkdir, "VC/Tools/MSVC/*"))) do
@@ -128,8 +126,9 @@ function find_build_tools(opt)
             return
         end
     end
+    variables.VCInstallDir = VCInstallDir
     variables.VCToolsVersion = VCToolsVersion
-    variables.VCToolsInstallDir = path.join(sdkdir, "VC/Tools/MSVC", VCToolsVersion)
+    variables.VCToolsInstallDir = path.join(VCInstallDir, "Tools/MSVC", VCToolsVersion)
 
     local WindowsSDKVersion
     local vs_sdkver = opt.vs_sdkver
@@ -145,10 +144,15 @@ function find_build_tools(opt)
     end
     variables.WindowsSDKVersion = WindowsSDKVersion
     variables.WindowsSdkDir = path.join(sdkdir, "Windows Kits/10")
+    variables.WindowsSdkBinPath = path.join(variables.WindowsSdkDir, "bin")
+    variables.WindowsSdkVerBinPath = path.join(variables.WindowsSdkBinPath, WindowsSDKVersion)
+    variables.ExtensionSdkDir = path.join(variables.WindowsSdkDir, "ExtensionSdkDir")
+    variables.UCRTVersion = WindowsSDKVersion
+    variables.UniversalCRTSdkDir = variables.WindowsSdkDir
 
     local includedirs = {
         path.join(variables.VCToolsInstallDir, "include"),
-        path.join(variables.VCToolsInstallDir, "atlmfc/include"),
+        path.join(variables.VCToolsInstallDir, "atlmfc", "include"),
         path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "ucrt"),
         path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "shared"),
         path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "um"),
@@ -158,8 +162,10 @@ function find_build_tools(opt)
 
     local linkdirs = {
         path.join(variables.VCToolsInstallDir, "lib"),
+        path.join(variables.VCToolsInstallDir, "atlmfc", "lib"),
         path.join(variables.WindowsSdkDir, "Lib", WindowsSDKVersion, "ucrt"),
         path.join(variables.WindowsSdkDir, "Lib", WindowsSDKVersion, "um"),
+        path.join(variables.WindowsSdkDir, "Lib", WindowsSDKVersion, "km"),
     }
 
     local archs = {
@@ -182,32 +188,42 @@ function find_build_tools(opt)
         if #lib ~= 0 then
             local vcvars = {
                 BUILD_TOOLS_ROOT = sdkdir,
+                VSInstallDir = sdkdir,
 
                 -- vs runs in a windows ctx, so the envsep is always ";"
                 INCLUDE = path.joinenv(includedirs, ';'),
                 LIB = path.joinenv(lib, ';'),
 
-                WindowsSdkDir = variables.WindowsSdkDir,
-                WindowsSDKVersion = WindowsSDKVersion,
-                VCToolsInstallDir = variables.VCToolsInstallDir,
                 VSCMD_ARG_HOST_ARCH = "x64",
+
+                VCInstallDir = variables.VCInstallDir,
+                VCToolsVersion = variables.VCToolsVersion,
+                VCToolsInstallDir = variables.VCToolsInstallDir,
+
+                WindowsSDKVersion = variables.WindowsSDKVersion,
+                WindowsSdkDir = variables.WindowsSdkDir,
+                WindowsSdkBinPath = variables.WindowsSdkBinPath,
+                WindowsSdkVerBinPath = variables.WindowsSdkVerBinPath,
+                ExtensionSdkDir = variables.ExtensionSdkDir,
+                UCRTVersion = variables.UCRTVersion,
+                UniversalCRTSdkDir = variables.UniversalCRTSdkDir,
             }
 
-            local buidl_tools_bin = {}
+            local build_tools_bin = {}
             local host_dir = "Host" .. vcvars.VSCMD_ARG_HOST_ARCH
             if is_host("windows") then
-                table.insert(buidl_tools_bin, path.join(vcvars.VCToolsInstallDir, "bin", host_dir, target_arch))
-                table.insert(buidl_tools_bin, path.join(vcvars.WindowsSdkDir, "bin", WindowsSDKVersion))
-                table.insert(buidl_tools_bin, path.join(vcvars.WindowsSdkDir, "bin", WindowsSDKVersion, "ucrt"))
+                table.insert(build_tools_bin, path.join(vcvars.VCToolsInstallDir, "bin", host_dir, target_arch))
+                table.insert(build_tools_bin, path.join(vcvars.WindowsSdkDir, "bin", WindowsSDKVersion))
+                table.insert(build_tools_bin, path.join(vcvars.WindowsSdkDir, "bin", WindowsSDKVersion, "ucrt"))
             elseif is_host("linux") then
                 -- for msvc-wine
-                table.insert(buidl_tools_bin, path.join(sdkdir, "bin", target_arch))
+                table.insert(build_tools_bin, path.join(sdkdir, "bin", target_arch))
             end
 
             vcvars.VSCMD_ARG_TGT_ARCH = target_arch
-            vcvars.BUILD_TOOLS_BIN = path.joinenv(buidl_tools_bin)
+            vcvars.BUILD_TOOLS_BIN = path.joinenv(build_tools_bin)
 
-            local PATH = buidl_tools_bin
+            local PATH = build_tools_bin
             table.join2(PATH, path.splitenv(os.getenv("PATH")))
             vcvars.PATH = path.joinenv(PATH)
 
diff --git a/xmake/modules/detect/tools/find_7z.lua b/xmake/modules/detect/tools/find_7z.lua
@@ -45,7 +45,7 @@ function main(opt)
 
     -- find 7z from builtin xmake/winenv
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
         table.insert(opt.paths, path.join(os.programdir(), "winenv", "bin"))
     end
 
diff --git a/xmake/modules/detect/tools/find_bash.lua b/xmake/modules/detect/tools/find_bash.lua
@@ -43,7 +43,7 @@ function main(opt)
 
     -- find bash from git for windows
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
         table.insert(opt.paths, "$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\GitForWindows;InstallPath)\\bin")
     end
 
diff --git a/xmake/modules/detect/tools/find_clang_format.lua b/xmake/modules/detect/tools/find_clang_format.lua
@@ -41,7 +41,7 @@ function main(opt)
     if not program and is_host("macosx") then
         local llvm = try {function () return os.iorunv("brew", {"--prefix", "llvm"}) end}
         if llvm then
-            opt.paths = opt.paths or {}
+            opt.paths = table.wrap(opt.paths)
             opt.force = true
             table.insert(opt.paths, path.join(llvm:trim(), "bin"))
             program = find_program(opt.program or "clang-format", opt)
diff --git a/xmake/modules/detect/tools/find_clang_scan_deps.lua b/xmake/modules/detect/tools/find_clang_scan_deps.lua
@@ -41,7 +41,7 @@ function main(opt)
     if not program and is_host("macosx") then
         local llvm = try {function () return os.iorunv("brew", {"--prefix", "llvm"}) end}
         if llvm then
-            opt.paths = opt.paths or {}
+            opt.paths = table.wrap(opt.paths)
             opt.force = true
             table.insert(opt.paths, path.join(llvm:trim(), "bin"))
             program = find_program(opt.program or "clang-scan-deps", opt)
diff --git a/xmake/modules/detect/tools/find_clang_tidy.lua b/xmake/modules/detect/tools/find_clang_tidy.lua
@@ -41,7 +41,7 @@ function main(opt)
     if not program and is_host("macosx") then
         local llvm = try {function () return os.iorunv("brew", {"--prefix", "llvm"}) end}
         if llvm then
-            opt.paths = opt.paths or {}
+            opt.paths = table.wrap(opt.paths)
             opt.force = true
             table.insert(opt.paths, path.join(llvm:trim(), "bin"))
             program = find_program(opt.program or "clang-tidy", opt)
diff --git a/xmake/modules/detect/tools/find_curl.lua b/xmake/modules/detect/tools/find_curl.lua
@@ -42,7 +42,7 @@ function main(opt)
 
     -- find curl from builtin xmake/winenv
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
         table.insert(opt.paths, path.join(os.programdir(), "winenv", "bin"))
     end
 
diff --git a/xmake/modules/detect/tools/find_dxc.lua b/xmake/modules/detect/tools/find_dxc.lua
@@ -43,6 +43,7 @@ function main(opt)
         "$(env VK_SDK_PATH)/Bin",
         "$(env PATH)"
     }
+    opt.paths = table.wrap(opt.paths)
     local program = find_program(opt.program or "dxc.exe", opt)
     local version = nil
     if program and opt and opt.version then
diff --git a/xmake/modules/detect/tools/find_iverilog.lua b/xmake/modules/detect/tools/find_iverilog.lua
@@ -43,7 +43,7 @@ function main(opt)
 
     -- find it from some logical drives paths
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
         for _, logical_drive in ipairs(winos.logical_drives()) do
             table.insert(opt.paths, path.join(logical_drive, "iverilog", "bin"))
         end
diff --git a/xmake/modules/detect/tools/find_midl.lua b/xmake/modules/detect/tools/find_midl.lua
@@ -45,7 +45,7 @@ function main(opt)
         local arch = toolchain and toolchain:arch() or config.arch()
         local bindir = path.join(envs.WindowsSdkDir, "bin", envs.WindowsSDKVersion, arch)
         if os.isdir(bindir) then
-            opt.paths = opt.paths or {}
+            opt.paths = table.wrap(opt.paths)
             table.insert(opt.paths, bindir)
         end
     end
diff --git a/xmake/modules/detect/tools/find_ollydbg.lua b/xmake/modules/detect/tools/find_ollydbg.lua
@@ -50,6 +50,7 @@ function main(opt)
             return (val("reg " .. reg) or ""):match("\"(.-)\"")
         end
     end
+    opt.paths = table.wrap(opt.paths)
     opt.check  = opt.check or function (program) if not os.isfile(program) then raise() end end
 
     -- find program
diff --git a/xmake/modules/detect/tools/find_python3.lua b/xmake/modules/detect/tools/find_python3.lua
@@ -40,7 +40,7 @@ function main(opt)
     -- init options
     opt = opt or {}
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
         local keys = winos.registry_keys("HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\3.*\\InstallPath")
         for _, key in ipairs(keys) do
             local value = try {function () return winos.registry_query(key .. ";ExecutablePath") end}
diff --git a/xmake/modules/detect/tools/find_renderdoc.lua b/xmake/modules/detect/tools/find_renderdoc.lua
@@ -40,7 +40,7 @@ function main(opt)
     -- init options
     opt = opt or {}
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
 
         -- add paths from registry
         local regs =
diff --git a/xmake/modules/detect/tools/find_vsjitdebugger.lua b/xmake/modules/detect/tools/find_vsjitdebugger.lua
@@ -50,6 +50,7 @@ function main(opt)
             return (val("reg " .. reg) or ""):match("\"(.-)\"")
         end
     end
+    opt.paths = table.wrap(opt.paths)
     opt.check  = opt.check or function (program) if not os.isfile(program) then raise() end end
 
     -- find program
diff --git a/xmake/modules/detect/tools/find_vswhere.lua b/xmake/modules/detect/tools/find_vswhere.lua
@@ -55,6 +55,7 @@ function main(opt)
         "$(env ProgramFiles%(x86%))\\Microsoft Visual Studio\\Installer",
         "$(env ProgramFiles)\\Microsoft Visual Studio\\Installer"
     }
+    opt.paths = table.wrap(opt.paths)
     local program = find_program(opt.program or "vswhere.exe", opt)
 
     -- find program version
diff --git a/xmake/modules/detect/tools/find_vvp.lua b/xmake/modules/detect/tools/find_vvp.lua
@@ -43,7 +43,7 @@ function main(opt)
 
     -- find it from some logical drives paths
     if is_host("windows") then
-        opt.paths = opt.paths or {}
+        opt.paths = table.wrap(opt.paths)
         for _, logical_drive in ipairs(winos.logical_drives()) do
             table.insert(opt.paths, path.join(logical_drive, "iverilog", "bin"))
         end
diff --git a/xmake/modules/detect/tools/find_windbg.lua b/xmake/modules/detect/tools/find_windbg.lua
@@ -50,6 +50,7 @@ function main(opt)
             return (val("reg " .. reg) or ""):match("\"(.-)\"")
         end
     end
+    opt.paths = table.wrap(opt.paths)
     opt.check  = opt.check or function (program) if not os.isfile(program) then raise() end end
 
     -- find program
diff --git a/xmake/modules/detect/tools/find_x64dbg.lua b/xmake/modules/detect/tools/find_x64dbg.lua
@@ -50,6 +50,7 @@ function main(opt)
             return (val("reg " .. reg) or ""):match("\"(.-)\"")
         end
     end
+    opt.paths = table.wrap(opt.paths)
     opt.check  = opt.check or function (program) if not os.isfile(program) then raise() end end
 
     -- find program
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua
diff --git a/xmake/modules/target/action/install/pkgconfig_importfiles.lua b/xmake/modules/target/action/install/pkgconfig_importfiles.lua
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
diff --git a/xmake/rules/c++/modules/builder.lua b/xmake/rules/c++/modules/builder.lua
diff --git a/xmake/rules/c++/modules/scanner.lua b/xmake/rules/c++/modules/scanner.lua
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
diff --git a/xmake/rules/python/cython/xmake.lua b/xmake/rules/python/cython/xmake.lua
diff --git a/xmake/rules/python/library/xmake.lua b/xmake/rules/python/library/xmake.lua
diff --git a/xmake/rules/python/module/xmake.lua b/xmake/rules/python/module/xmake.lua
