rename more buildir in plugins

6 files changed, 53 insertions, 35 deletions

diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index fb38858a8..d0055422d 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -983,10 +983,13 @@ function _fix_pdbdir_for_ninja(package)
 end
 
 -- enter build directory
-function _enter_buildir(package, opt)
-    local buildir = opt.buildir or package:builddir()
-    os.mkdir(path.join(buildir, "install"))
-    return os.cd(buildir)
+function _enter_builddir(package, opt)
+    local builddir = opt.builddir or opt.buildir or package:builddir()
+    if opt.buildir then
+        wprint("{buildir = } has been deprecated, please use {builddir = } in cmake.install")
+    end
+    os.mkdir(path.join(builddir, "install"))
+    return os.cd(builddir)
 end
 
 -- get build environments
@@ -1305,7 +1308,7 @@ end
 
 function configure(package, configs, opt)
     opt = opt or {}
-    local oldir = _enter_buildir(package, opt)
+    local oldir = _enter_builddir(package, opt)
 
     -- pass configurations
     local argv = {}
@@ -1339,7 +1342,7 @@ function build(package, configs, opt)
     configure(package, configs, opt)
 
     -- do build
-    local oldir = _enter_buildir(package, opt)
+    local oldir = _enter_builddir(package, opt)
     if opt.cmake_build then
         _build_for_cmakebuild(package, configs, opt)
     elseif cmake_generator then
@@ -1371,7 +1374,7 @@ function install(package, configs, opt)
     configure(package, configs, opt)
 
     -- do build and install
-    local oldir = _enter_buildir(package, opt)
+    local oldir = _enter_builddir(package, opt)
     if opt.cmake_build then
         _install_for_cmakebuild(package, configs, opt)
     elseif cmake_generator then
diff --git a/xmake/modules/package/tools/gn.lua b/xmake/modules/package/tools/gn.lua
index 568b881bb..1a34b3085 100644
--- a/xmake/modules/package/tools/gn.lua
+++ b/xmake/modules/package/tools/gn.lua
@@ -25,12 +25,15 @@ import("lib.detect.find_tool")
 import("package.tools.ninja")
 
 -- get build directory
-function _get_buildir(opt)
-    if opt and opt.buildir then
-        return opt.buildir
+function _get_builddir(opt)
+    if opt and (opt.builddir or opt.buildir) then
+        if opt.buildir then
+            wprint("{buildir = } has been deprecated, please use {builddir = } in gn.install")
+        end
+        return opt.builddir or opt.buildir
     else
-        _g.buildir = _g.buildir or ("build_" .. hash.uuid4():split('%-')[1])
-        return _g.buildir
+        _g.builddir = _g.builddir or ("build_" .. hash.uuid4():split('%-')[1])
+        return _g.builddir
     end
 end
 
@@ -98,7 +101,7 @@ function generate(package, configs, opt)
     local argv = {}
     local args = {}
     table.insert(argv, "gen")
-    table.insert(argv, _get_buildir(opt))
+    table.insert(argv, _get_builddir(opt))
     for name, value in pairs(_get_configs(package, configs, opt)) do
         if type(value) == "string" then
             table.insert(args, name .. "=\"" .. value .. "\"")
@@ -123,9 +126,9 @@ function build(package, configs, opt)
     generate(package, configs, opt)
 
     -- do build
-    local buildir = _get_buildir(opt)
+    local builddir = _get_builddir(opt)
     local targets = table.wrap(opt.target)
-    ninja.build(package, targets, {buildir = buildir, envs = opt.envs or buildenvs(package, opt)})
+    ninja.build(package, targets, {builddir = builddir, envs = opt.envs or buildenvs(package, opt)})
 end
 
 -- install package
@@ -136,7 +139,7 @@ function install(package, configs, opt)
     generate(package, configs, opt)
 
     -- do build and install
-    local buildir = _get_buildir(opt)
+    local builddir = _get_builddir(opt)
     local targets = table.wrap(opt.target)
-    ninja.install(package, targets, {buildir = buildir, envs = opt.envs or buildenvs(package, opt)})
+    ninja.install(package, targets, {builddir = builddir, envs = opt.envs or buildenvs(package, opt)})
 end
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index 9209300ac..3a26d355c 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -27,12 +27,15 @@ import("private.utils.executable_path")
 import("private.utils.toolchain", {alias = "toolchain_utils"})
 
 -- get build directory
-function _get_buildir(package, opt)
-    if opt and opt.buildir then
-        return opt.buildir
+function _get_builddir(package, opt)
+    if opt and (opt.builddir or opt.buildir) then
+        if opt.buildir then
+            wprint("{buildir = } has been deprecated, please use {builddir = } in meson.install")
+        end
+        return opt.builddir or opt.buildir
     else
-        _g.buildir = _g.buildir or package:builddir()
-        return _g.buildir
+        _g.builddir = _g.builddir or package:builddir()
+        return _g.builddir
     end
 end
 
@@ -203,7 +206,7 @@ end
 -- get cross file
 function _get_configs_file(package, opt)
     opt = opt or {}
-    local configsfile = path.join(_get_buildir(package, opt), "configs_file.txt")
+    local configsfile = path.join(_get_builddir(package, opt), "configs_file.txt")
     if not os.isfile(configsfile) then
         local file = io.open(configsfile, "w")
         -- binaries
@@ -370,7 +373,7 @@ function _get_configs(package, configs, opt)
     end
 
     -- add build directory
-    table.insert(configs, _get_buildir(package, opt))
+    table.insert(configs, _get_builddir(package, opt))
     return configs
 end
 
@@ -567,9 +570,9 @@ function build(package, configs, opt)
     generate(package, configs, opt)
 
     -- configurate build
-    local buildir = _get_buildir(package, opt)
+    local builddir = _get_builddir(package, opt)
     local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
-    local argv = {"compile", "-C", buildir}
+    local argv = {"compile", "-C", builddir}
     if option.get("diagnosis") then
         table.insert(argv, "-v")
     end
@@ -589,8 +592,8 @@ function install(package, configs, opt)
     build(package, configs, opt)
 
     -- configure install
-    local buildir = _get_buildir(package, opt)
-    local argv = {"install", "-C", buildir}
+    local builddir = _get_builddir(package, opt)
+    local argv = {"install", "-C", builddir}
 
     -- do install
     local meson = assert(find_tool("meson"), "meson not found!")
diff --git a/xmake/modules/package/tools/ninja.lua b/xmake/modules/package/tools/ninja.lua
index 2d2fb734d..1afc6056e 100644
--- a/xmake/modules/package/tools/ninja.lua
+++ b/xmake/modules/package/tools/ninja.lua
@@ -24,8 +24,11 @@ import("lib.detect.find_tool")
 
 function _default_argv(package, configs, opt)
     opt = opt or {}
-    local buildir = opt.buildir or os.curdir()
+    local builddir = opt.builddir or opt.buildir or os.curdir()
     local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
+    if opt.buildir then
+        wprint("{buildir = } has been deprecated, please use {builddir = } in ninja.install")
+    end
 
     local argv = {}
     local targets = table.wrap(opt.target)
@@ -33,7 +36,7 @@ function _default_argv(package, configs, opt)
         table.join2(argv, targets)
     end
     table.insert(argv, "-C")
-    table.insert(argv, buildir)
+    table.insert(argv, builddir)
     if option.get("diagnosis") then
         table.insert(argv, "-v")
     end
diff --git a/xmake/modules/package/tools/scons.lua b/xmake/modules/package/tools/scons.lua
index f9208042d..e0aac7e7b 100644
--- a/xmake/modules/package/tools/scons.lua
+++ b/xmake/modules/package/tools/scons.lua
@@ -100,10 +100,13 @@ end
 -- build package
 function build(package, configs, opt)
     opt = opt or {}
-    local buildir = opt.buildir or os.curdir()
+    local builddir = opt.builddir or opt.buildir or os.curdir()
+    if opt.buildir then
+        wprint("{buildir = } has been deprecated, please use {builddir = } in scons.install")
+    end
     local njob = opt.jobs or option.get("jobs") or tostring(os.default_njob())
     local scons = assert(find_tool("scons"), "scons not found!")
-    local argv = {"-C", buildir, "-j", njob}
+    local argv = {"-C", builddir, "-j", njob}
     configs = _get_configs(package, configs)
     if configs then
         table.join2(argv, configs)
diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua
index 0f19c6a88..35ed6fd23 100644
--- a/xmake/modules/package/tools/xmake.lua
+++ b/xmake/modules/package/tools/xmake.lua
@@ -315,9 +315,12 @@ function _get_configs(package, configs, opt)
     if shflags and #shflags > 0 then
         table.insert(configs, "--shflags=" .. table.concat(shflags, ' '))
     end
-    local buildir = opt.buildir or package:builddir()
-    if buildir then
-        table.insert(configs, "--buildir=" .. buildir)
+    local builddir = opt.builddir or opt.buildir or package:builddir()
+    if builddir then
+        table.insert(configs, "--builddir=" .. builddir)
+    end
+    if opt.buildir then
+        wprint("{buildir = } has been deprecated, please use {builddir = } in xmake.install")
     end
     return configs
 end