rename more buildir

8 files changed, 39 insertions, 39 deletions

diff --git a/xmake/modules/package/manager/conan/v1/install_package.lua b/xmake/modules/package/manager/conan/v1/install_package.lua
index d0928c28e..37fdaa856 100644
--- a/xmake/modules/package/manager/conan/v1/install_package.lua
+++ b/xmake/modules/package/manager/conan/v1/install_package.lua
@@ -128,16 +128,16 @@ function main(conan, name, opt)
     local configs = opt.configs or {}
 
     -- get build directory
-    local buildir = _conan_get_build_directory(name)
+    local builddir = _conan_get_build_directory(name)
 
     -- clean the build directory
-    os.tryrm(buildir)
-    if not os.isdir(buildir) then
-        os.mkdir(buildir)
+    os.tryrm(builddir)
+    if not os.isdir(builddir) then
+        os.mkdir(builddir)
     end
 
     -- enter build directory
-    local oldir = os.cd(buildir)
+    local oldir = os.cd(builddir)
 
     -- install xmake generator
     _conan_install_xmake_generator(conan)
diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua
index 7b56b7d9c..d3d109a7e 100644
--- a/xmake/modules/package/manager/conan/v2/install_package.lua
+++ b/xmake/modules/package/manager/conan/v2/install_package.lua
@@ -287,16 +287,16 @@ function main(conan, name, opt)
     local configs = opt.configs or {}
 
     -- get build directory
-    local buildir = _conan_get_build_directory(name)
+    local builddir = _conan_get_build_directory(name)
 
     -- clean the build directory
-    os.tryrm(buildir)
-    if not os.isdir(buildir) then
-        os.mkdir(buildir)
+    os.tryrm(builddir)
+    if not os.isdir(builddir) then
+        os.mkdir(builddir)
     end
 
     -- enter build directory
-    local oldir = os.cd(buildir)
+    local oldir = os.cd(builddir)
 
     -- install xmake generator
     _conan_install_xmake_generator(conan)
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 8fd001d71..fb38858a8 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -984,7 +984,7 @@ end
 
 -- enter build directory
 function _enter_buildir(package, opt)
-    local buildir = opt.buildir or package:buildir()
+    local buildir = opt.buildir or package:builddir()
     os.mkdir(path.join(buildir, "install"))
     return os.cd(buildir)
 end
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index 7f3260682..9209300ac 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -31,7 +31,7 @@ function _get_buildir(package, opt)
     if opt and opt.buildir then
         return opt.buildir
     else
-        _g.buildir = _g.buildir or package:buildir()
+        _g.buildir = _g.buildir or package:builddir()
         return _g.buildir
     end
 end
diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua
index 25bc0f021..0f19c6a88 100644
--- a/xmake/modules/package/tools/xmake.lua
+++ b/xmake/modules/package/tools/xmake.lua
@@ -315,7 +315,7 @@ 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:buildir()
+    local buildir = opt.buildir or package:builddir()
     if buildir then
         table.insert(configs, "--buildir=" .. buildir)
     end
diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua
index 921d68185..c2ca3610b 100644
--- a/xmake/modules/private/action/trybuild/cmake.lua
+++ b/xmake/modules/private/action/trybuild/cmake.lua
@@ -28,13 +28,13 @@ import("lib.detect.find_tool")
 import("private.utils.toolchain", {alias = "toolchain_utils"})
 
 -- get build directory
-function _get_buildir()
+function _get_builddir()
     return config.builddir() or "build"
 end
 
 -- get artifacts directory
 function _get_artifacts_dir()
-    return path.absolute(path.join(_get_buildir(), "artifacts"))
+    return path.absolute(path.join(_get_builddir(), "artifacts"))
 end
 
 -- get the build environment
@@ -515,11 +515,11 @@ end
 
 -- do clean
 function clean()
-    local buildir = _get_buildir()
-    if os.isdir(buildir) then
-        local configfile = find_file("[mM]akefile", buildir) or (is_plat("windows") and find_file("*.sln", buildir))
+    local builddir = _get_builddir()
+    if os.isdir(builddir) then
+        local configfile = find_file("[mM]akefile", builddir) or (is_plat("windows") and find_file("*.sln", builddir))
         if configfile then
-            local oldir = os.cd(buildir)
+            local oldir = os.cd(builddir)
             if is_plat("windows") then
                 local runenvs = _get_msvc_runenvs()
                 local msbuild = find_tool("msbuild", {envs = runenvs})
@@ -544,7 +544,7 @@ function build()
     if not os.isdir(artifacts_dir) then
         os.mkdir(artifacts_dir)
     end
-    os.cd(_get_buildir())
+    os.cd(_get_builddir())
     opt.artifacts_dir = artifacts_dir
 
     -- exists $CMAKE_GENERATOR? use it
diff --git a/xmake/modules/private/action/trybuild/meson.lua b/xmake/modules/private/action/trybuild/meson.lua
index d0a4f5197..1896653c6 100644
--- a/xmake/modules/private/action/trybuild/meson.lua
+++ b/xmake/modules/private/action/trybuild/meson.lua
@@ -26,13 +26,13 @@ import("lib.detect.find_file")
 import("lib.detect.find_tool")
 
 -- get build directory
-function _get_buildir()
+function _get_builddir()
     return config.builddir() or "build"
 end
 
 -- get artifacts directory
 function _get_artifacts_dir()
-    return path.absolute(path.join(_get_buildir(), "artifacts"))
+    return path.absolute(path.join(_get_builddir(), "artifacts"))
 end
 
 -- is cross compilation?
@@ -73,8 +73,8 @@ function _get_buildenv(key)
 end
 
 -- get cross file
-function _get_cross_file(buildir)
-    local crossfile = path.join(buildir, "cross_file.txt")
+function _get_cross_file(builddir)
+    local crossfile = path.join(builddir, "cross_file.txt")
     if not os.isfile(crossfile) then
         local file = io.open(crossfile, "w")
         -- binaries
@@ -209,7 +209,7 @@ function _get_cross_file(buildir)
 end
 
 -- get configs
-function _get_configs(artifacts_dir, buildir)
+function _get_configs(artifacts_dir, builddir)
 
     -- add prefix
     local configs = {"--prefix=" .. artifacts_dir}
@@ -227,11 +227,11 @@ function _get_configs(artifacts_dir, buildir)
 
     -- add cross file
     if _is_cross_compilation() then
-        table.insert(configs, "--cross-file=" .. _get_cross_file(buildir))
+        table.insert(configs, "--cross-file=" .. _get_cross_file(builddir))
     end
 
     -- add build directory
-    table.insert(configs, buildir)
+    table.insert(configs, builddir)
     return configs
 end
 
@@ -242,12 +242,12 @@ end
 
 -- do clean
 function clean()
-    local buildir = _get_buildir()
-    if os.isdir(buildir) then
-        local configfile = find_file("build.ninja", buildir)
+    local builddir = _get_builddir()
+    if os.isdir(builddir) then
+        local configfile = find_file("build.ninja", builddir)
         if configfile then
             local ninja = assert(find_tool("ninja"), "ninja not found!")
-            local ninja_argv = {"-C", buildir}
+            local ninja_argv = {"-C", builddir}
             if option.get("verbose") or option.get("diagnosis") then
                 table.insert(ninja_argv, "-v")
             end
@@ -255,7 +255,7 @@ function clean()
             table.insert(ninja_argv, "clean")
             os.vexecv(ninja.program, ninja_argv)
             if option.get("all") then
-                os.tryrm(buildir)
+                os.tryrm(builddir)
             end
         end
     end
@@ -271,16 +271,16 @@ function build()
     end
 
     -- generate makefile
-    local buildir = _get_buildir()
+    local builddir = _get_builddir()
     local meson = assert(find_tool("meson"), "meson not found!")
-    local configfile = find_file("build.ninja", buildir)
+    local configfile = find_file("build.ninja", builddir)
     if not configfile or os.mtime(config.filepath()) > os.mtime(configfile) then
-        os.vexecv(meson.program, _get_configs(artifacts_dir, buildir))
+        os.vexecv(meson.program, _get_configs(artifacts_dir, builddir))
     end
 
     -- do build
     local ninja = assert(find_tool("ninja"), "ninja not found!")
-    local ninja_argv = {"-C", buildir}
+    local ninja_argv = {"-C", builddir}
     if option.get("verbose") then
         table.insert(ninja_argv, "-v")
     end
diff --git a/xmake/modules/private/service/distcc_build/server_session.lua b/xmake/modules/private/service/distcc_build/server_session.lua
index 8e373d254..57f13a3a7 100644
--- a/xmake/modules/private/service/distcc_build/server_session.lua
+++ b/xmake/modules/private/service/distcc_build/server_session.lua
@@ -80,7 +80,7 @@ end
 -- do clean
 function server_session:clean()
     vprint("%s: clean files in %s ..", self, self:workdir())
-    os.tryrm(self:buildir())
+    os.tryrm(self:builddir())
     os.tryrm(self:cachedir())
     vprint("%s: clean files ok", self)
 end
@@ -93,7 +93,7 @@ function server_session:compile(respmsg)
     local stream = self:stream()
     local cachekey = body.cachekey
     local sourcename = body.sourcename
-    local sourcedir = path.join(self:buildir(), (hash.uuid4():gsub("-", "")))
+    local sourcedir = path.join(self:builddir(), (hash.uuid4():gsub("-", "")))
     local sourcefile = path.join(sourcedir, sourcename)
     local objectfile = (cachekey and path.join(self:cachedir(), cachekey:sub(1, 2), cachekey) or sourcefile) .. ".o"
     local objectfile_infofile = objectfile .. ".txt"
@@ -192,7 +192,7 @@ function server_session:workdir()
 end
 
 -- get build directory
-function server_session:buildir()
+function server_session:builddir()
     return path.join(self:workdir(), "build")
 end