diff options
| author | ruki <[email protected]> | 2025-07-21 23:44:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-07-21 23:44:53 +0800 |
| commit | 18a4159b5b05de5e65bdbd3c2ae8b8fc6e97a146 (patch) | |
| tree | 9a85e81b771b120ea8c75c65e3b7248d5fd10524 | |
| parent | 6694d5b11dd4740d1ff8a401f43574e85efd2076 (diff) | |
rename buildir
| -rw-r--r-- | core/src/cli/xmake.lua | 2 | ||||
| -rw-r--r-- | core/src/xmake/xmake.lua | 6 | ||||
| -rw-r--r-- | core/xpack.lua | 10 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 1 |
4 files changed, 9 insertions, 10 deletions
diff --git a/core/src/cli/xmake.lua b/core/src/cli/xmake.lua index 8a94aa974..2e4b1aea9 100644 --- a/core/src/cli/xmake.lua +++ b/core/src/cli/xmake.lua @@ -11,7 +11,7 @@ target("cli") -- make as a binary set_kind("binary") set_basename("xmake") - set_targetdir("$(buildir)") + set_targetdir("$(builddir)") -- add definitions add_defines("__tb_prefix__=\"xmake\"") diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index ac943fb9e..0883d071b 100644 --- a/core/src/xmake/xmake.lua +++ b/core/src/xmake/xmake.lua @@ -27,19 +27,19 @@ target("xmake") end -- set the auto-generated config.h - set_configdir("$(buildir)/$(plat)/$(arch)/$(mode)") + set_configdir("$(builddir)/$(plat)/$(arch)/$(mode)") add_configfiles("xmake.config.h.in") -- add includes directory add_includedirs("..", {interface = true}) - add_includedirs("$(buildir)/$(plat)/$(arch)/$(mode)", {public = true}) + add_includedirs("$(builddir)/$(plat)/$(arch)/$(mode)", {public = true}) add_includedirs("../xxhash") add_includedirs("$(projectdir)/../xmake/scripts/module") -- add header files add_headerfiles("../(xmake/*.h)") add_headerfiles("../(xmake/prefix/*.h)") - add_headerfiles("$(buildir)/$(plat)/$(arch)/$(mode)/xmake.config.h", {prefixdir = "xmake"}) + add_headerfiles("$(builddir)/$(plat)/$(arch)/$(mode)/xmake.config.h", {prefixdir = "xmake"}) -- add the common source files add_files("**.c|winos/*.c") diff --git a/core/xpack.lua b/core/xpack.lua index b6ee83633..f33ba2994 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -49,11 +49,11 @@ xpack("xmake") 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") - local tmpdir_curl = path.join(package:buildir(), "curl") - local winenv_bindir = path.join(package:buildir(), "winenv", "bin") + local archive_7z = path.join(package:builddir(), "7z.zip") + local archive_curl = path.join(package:builddir(), "curl.zip") + local tmpdir_7z = path.join(package:builddir(), "7z") + local tmpdir_curl = path.join(package:builddir(), "curl") + local winenv_bindir = path.join(package:builddir(), "winenv", "bin") os.mkdir(winenv_bindir) http.download(url_7z, archive_7z, {insecure = global.get("insecure-ssl")}) archive.extract(archive_7z, tmpdir_7z) diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 47ff14036..a81ba6f99 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -1256,7 +1256,6 @@ function _get_package_compatkey(dep) table.sort(configs_order) key = key .. ":" .. string.serialize(configs_order, true) end - end return key end |