diff options
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/macro/macros/package.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/show/info/basic.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/watch/main.lua | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xmake/plugins/macro/macros/package.lua b/xmake/plugins/macro/macros/package.lua index 64ea352de..14a7992c0 100644 --- a/xmake/plugins/macro/macros/package.lua +++ b/xmake/plugins/macro/macros/package.lua @@ -88,7 +88,7 @@ function main(argv) config.load() os.cd(project.directory()) - local outputdir = args.outputdir or config.get("buildir") + local outputdir = args.outputdir or config.builddir() local targets = {} if option.get("target") then local target = project.target(option.get("target")) diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 12d6497c0..ae69fbb58 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -131,7 +131,7 @@ function _make_targetinfo(mode, arch, target) -- save dirs targetinfo.targetdir = _make_dirs(target:get("targetdir")) - targetinfo.buildir = _make_dirs(config.get("buildir")) + targetinfo.builddir = _make_dirs(config.get("builddir") or config.get("buildir")) targetinfo.rundir = _make_dirs(target:get("rundir")) targetinfo.configdir = _make_dirs(os.getenv("XMAKE_CONFIGDIR")) targetinfo.configfiledir = _make_dirs(target:get("configdir")) @@ -425,7 +425,7 @@ function main(outputdir, vsinfo) -- init config flags local flags = {} for k, v in table.orderpairs(localcache.get("config", "options")) do - if k ~= "plat" and k ~= "mode" and k ~= "arch" and k ~= "clean" and k ~= "buildir" then + if k ~= "plat" and k ~= "mode" and k ~= "arch" and k ~= "clean" and k ~= "builddir" and k ~= "buildir" then table.insert(flags, "--" .. k .. "=" .. tostring(v)) end end diff --git a/xmake/plugins/show/info/basic.lua b/xmake/plugins/show/info/basic.lua index 8a26d14db..46840b55e 100644 --- a/xmake/plugins/show/info/basic.lua +++ b/xmake/plugins/show/info/basic.lua @@ -61,7 +61,7 @@ function main() cprint(" ${color.dump.string}mode${clear}: %s", config.mode()) end if config.builddir() then - cprint(" ${color.dump.string}buildir${clear}: %s", config.builddir()) + cprint(" ${color.dump.string}builddir${clear}: %s", config.builddir()) end cprint(" ${color.dump.string}configdir${clear}: %s", config.directory()) cprint(" ${color.dump.string}projectdir${clear}: %s", os.projectdir()) diff --git a/xmake/plugins/watch/main.lua b/xmake/plugins/watch/main.lua index b275671f8..f7269caf9 100644 --- a/xmake/plugins/watch/main.lua +++ b/xmake/plugins/watch/main.lua @@ -52,8 +52,8 @@ function _add_watchdirs() elseif os.isfile(os.projectfile()) then watchdirs = os.dirs(path.join(os.projectdir(), "*|.*")) for _, watchdir in ipairs(watchdirs) do - local buildir = path.absolute(config.builddir()) - if path.absolute(watchdir) ~= buildir then + local builddir = path.absolute(config.builddir()) + if path.absolute(watchdir) ~= builddir then _add_watchdir(watchdir, {recursion = true}) end end |