rename more buildir in plugins

23 files changed, 95 insertions, 77 deletions

diff --git a/tests/apis/add_configfiles/xmake.lua b/tests/apis/add_configfiles/xmake.lua
index 22da0dcf6..1d36d0cc7 100644
--- a/tests/apis/add_configfiles/xmake.lua
+++ b/tests/apis/add_configfiles/xmake.lua
@@ -23,7 +23,7 @@ target("test")
     add_files("main.c")
 
     set_configvar("module", "test")
-    set_configdir("$(buildir)/config")
+    set_configdir("$(builddir)/config")
     add_configfiles("test.c.in", {filename = "mytest.c"})
     add_configfiles("config.h.in", {variables = {hello = "xmake"}, prefixdir = "header",
         preprocessor = function (preprocessor_name, name, value, opt)
@@ -32,7 +32,7 @@ target("test")
             end
         end})
     add_configfiles("*.man", {onlycopy = true, prefixdir = "man"})
-    add_includedirs("$(buildir)/config/header")
+    add_includedirs("$(builddir)/config/header")
 
 
 target("test2")
@@ -40,10 +40,10 @@ target("test2")
     add_files("main2.c")
 
     set_configvar("module", "test2")
-    set_configdir("$(buildir)/config2")
+    set_configdir("$(builddir)/config2")
     add_configfiles("test.c.in", {filename = "mytest.c"})
     add_configfiles("config2.h.in", {variables = {hello = "xmake2"}, pattern = "@([^\n]-)@", prefixdir = "header"})
     add_configfiles("*.man", {onlycopy = true, prefixdir = "man"})
-    add_includedirs("$(buildir)/config2/header")
+    add_includedirs("$(builddir)/config2/header")
 
     add_options("foo2")
diff --git a/tests/apis/check_xxx/xmake.lua b/tests/apis/check_xxx/xmake.lua
index a72b575ae..3643100ce 100644
--- a/tests/apis/check_xxx/xmake.lua
+++ b/tests/apis/check_xxx/xmake.lua
@@ -3,7 +3,7 @@ includes("@builtin/check")
 target("foo")
     set_kind("static")
     add_files("foo.c")
-    add_includedirs("$(buildir)")
+    add_includedirs("$(builddir)")
     add_configfiles("config.h.in")
 
     check_bigendian("IS_BIG_ENDIAN")
diff --git a/tests/projects/other/autogen/autogen_code/xmake.lua b/tests/projects/other/autogen/autogen_code/xmake.lua
index 9bfe25d9f..9e6185ebe 100644
--- a/tests/projects/other/autogen/autogen_code/xmake.lua
+++ b/tests/projects/other/autogen/autogen_code/xmake.lua
@@ -2,9 +2,9 @@ add_rules("mode.debug", "mode.release")
 
 target("test")
     set_kind("binary")
-    add_files("$(buildir)/autogen.cpp", {always_added = true})
+    add_files("$(builddir)/autogen.cpp", {always_added = true})
     before_build(function (target)
-        io.writefile("$(buildir)/autogen.cpp", [[
+        io.writefile("$(builddir)/autogen.cpp", [[
 #include <iostream>
 using namespace std;
 int main(int argc, char** argv) {
diff --git a/tests/projects/other/merge_archive/xmake.lua b/tests/projects/other/merge_archive/xmake.lua
index 7cf74471d..83b60351a 100644
--- a/tests/projects/other/merge_archive/xmake.lua
+++ b/tests/projects/other/merge_archive/xmake.lua
@@ -4,21 +4,21 @@ target("add")
     set_kind("static")
     add_files("src/add.c")
     set_policy("build.fence", true)
-    set_targetdir("$(buildir)/merge_archive")
+    set_targetdir("$(builddir)/merge_archive")
 
 target("sub")
     set_kind("static")
     add_files("src/sub.c")
     set_policy("build.fence", true)
-    set_targetdir("$(buildir)/merge_archive")
+    set_targetdir("$(builddir)/merge_archive")
 
 target("mul")
     set_kind("static")
     add_deps("add", "sub")
     add_files("src/mul.c")
     if is_plat("windows") then
-        add_files("$(buildir)/merge_archive/*.lib")
+        add_files("$(builddir)/merge_archive/*.lib")
     else
-        add_files("$(buildir)/merge_archive/*.a")
+        add_files("$(builddir)/merge_archive/*.a")
     end
 
diff --git a/tests/projects/other/merge_object/xmake.lua b/tests/projects/other/merge_object/xmake.lua
index bbd7c1f98..0aece6849 100644
--- a/tests/projects/other/merge_object/xmake.lua
+++ b/tests/projects/other/merge_object/xmake.lua
@@ -5,7 +5,7 @@ target("merge_object")
     add_files("src/interface.c")
     set_policy("build.fence", true)
     after_build_file(function (target, sourcefile)
-        os.cp(target:objectfile(sourcefile), "$(buildir)/merge_object/")
+        os.cp(target:objectfile(sourcefile), "$(builddir)/merge_object/")
     end)
 
 target("test")
@@ -13,8 +13,8 @@ target("test")
     add_deps("merge_object")
     add_files("src/test.c")
     if is_plat("windows") then
-        add_files("$(buildir)/merge_object/interface.c.obj")
+        add_files("$(builddir)/merge_object/interface.c.obj")
     else
-        add_files("$(buildir)/merge_object/interface.c.o")
+        add_files("$(builddir)/merge_object/interface.c.o")
     end
 
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 899748d2e..02ca58799 100644
--- a/xmake/actions/config/main.lua
+++ b/xmake/actions/config/main.lua
@@ -372,9 +372,9 @@ force to build in current directory via run `xmake -P .`]], os.projectdir())
     end
 
     -- translate the build directory
-    local buildir = config.get("buildir")
-    if buildir and path.is_absolute(buildir) then
-        config.set("buildir", path.relative(buildir, project.directory()), {readonly = true, force = true})
+    local builddir = config.get("builddir") or config.get("buildir")
+    if builddir and path.is_absolute(builddir) then
+        config.set("builddir", path.relative(builddir, project.directory()), {readonly = true, force = true})
     end
 
     -- only config for building project using third-party buildsystem
diff --git a/xmake/core/project/config.lua b/xmake/core/project/config.lua
index 13be8c58d..507e70a00 100644
--- a/xmake/core/project/config.lua
+++ b/xmake/core/project/config.lua
@@ -78,6 +78,9 @@ function config.get(name)
             value = nil
         end
     end
+    if name == "buildir" then
+        utils.warning("`xmake f --buildir=` has been deprecated, please use `xmake f -o/--builddir=`")
+    end
     return value
 end
 
@@ -164,9 +167,6 @@ function config.builddir(opt)
     if not path.is_absolute(builddir) then
         builddir = path.absolute(builddir, rootdir)
     end
-    if not config.get("builddir") and config.get("buildir") then
-        utils.warning("`xmake f --buildir=` has been deprecated, please use `xmake f -o/--builddir=`")
-    end
 
     -- adjust path for the current directory
     if not opt.absolute then
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 010d240a2..974b0c9cc 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -2229,9 +2229,9 @@ function _instance:dependfile(objectfile)
 
     -- get relative directory in the build directory
     if not relativedir then
-        local buildir = path.absolute(config.builddir())
-        if origindir:startswith(buildir) then
-            relativedir = path.join("build", path.relative(origindir, buildir))
+        local builddir = path.absolute(config.builddir())
+        if origindir:startswith(builddir) then
+            relativedir = path.join("build", path.relative(origindir, builddir))
         end
     end
 
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
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
diff --git a/xmake/scripts/vsxmake/vsproj/Xmake.props b/xmake/scripts/vsxmake/vsproj/Xmake.props
index 301a13fd5..6c46bc5e1 100644
--- a/xmake/scripts/vsxmake/vsproj/Xmake.props
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.props
@@ -29,9 +29,9 @@
   </PropertyGroup>
 
   <PropertyGroup Label="XmakePathsFallback">
-    <XmakeBuilDir Condition="'$(XmakeBuilDir)' == ''">$(XmakeProjectDir)\build</XmakeBuilDir>
-    <XmakeTargetDir Condition="'$(XmakeTargetDir)' == ''">$(XmakeBuilDir)\$(XmakePlat)\$(XmakeArch)\$(XmakeMode)</XmakeTargetDir>
-    <XmakeConfigFileDir Condition="'$(XmakeConfigFileDir)' == ''">$(XmakeBuilDir)\$(XmakePlat)\$(XmakeArch)\$(XmakeMode)</XmakeConfigFileDir>
+    <XmakeBuilDDir Condition="'$(XmakeBuilDDir)' == ''">$(XmakeProjectDir)\build</XmakeBuilDDir>
+    <XmakeTargetDir Condition="'$(XmakeTargetDir)' == ''">$(XmakeBuilDDir)\$(XmakePlat)\$(XmakeArch)\$(XmakeMode)</XmakeTargetDir>
+    <XmakeConfigFileDir Condition="'$(XmakeConfigFileDir)' == ''">$(XmakeBuilDDir)\$(XmakePlat)\$(XmakeArch)\$(XmakeMode)</XmakeConfigFileDir>
 
     <XmakeConfigDir Condition="'$(XmakeConfigDir)' == ''">$(XMAKE_CONFIGDIR)</XmakeConfigDir>
     <XmakeConfigDir Condition="'$(XmakeConfigDir)' == ''">$(XmakeProjectDir)</XmakeConfigDir>
@@ -170,7 +170,7 @@
   <PropertyGroup Label="Path">
     <LibraryPath>$(XmakeLinkDirs);$(LibraryPath)</LibraryPath>
     <OutDir>$(XmakeTargetDir)\</OutDir>
-    <IntDir>$(XmakeBuilDir)\.vs\$(TargetName)\$(XmakeArch)\$(XmakeMode)\</IntDir>
+    <IntDir>$(XmakeBuilDDir)\.vs\$(TargetName)\$(XmakeArch)\$(XmakeMode)\</IntDir>
     <SourcePath>$(XmakeSourceDirs);$(SourcePath)</SourcePath>
   </PropertyGroup>
 
diff --git a/xmake/scripts/vsxmake/vsproj/Xmake.targets b/xmake/scripts/vsxmake/vsproj/Xmake.targets
index fd4da234e..ec7ea3532 100644
--- a/xmake/scripts/vsxmake/vsproj/Xmake.targets
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.targets
@@ -8,21 +8,21 @@
   </ImportGroup>
 
   <PropertyGroup Label="XmakePathsResolve">
-    <XmakeBuilDirResolved>$(XmakeBuilDir)</XmakeBuilDirResolved>
+    <XmakeBuilDDirResolved>$(XmakeBuilDDir)</XmakeBuilDDirResolved>
     <XmakeTargetDirResolved>$(XmakeTargetDir)</XmakeTargetDirResolved>
     <XmakeConfigDirResolved>$(XmakeConfigDir)</XmakeConfigDirResolved>
     <XmakeConfigFileDirResolved>$(XmakeConfigFileDir)</XmakeConfigFileDirResolved>
     <XmakeRunDirResolved>$(XmakeRunDir)</XmakeRunDirResolved>
 
     <!-- resolve if they are relative paths -->
-    <XmakeBuilDirResolved Condition="!$([System.IO.Path]::IsPathRooted('$(XmakeBuilDirResolved)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeBuilDirResolved)'))</XmakeBuilDirResolved>
+    <XmakeBuilDDirResolved Condition="!$([System.IO.Path]::IsPathRooted('$(XmakeBuilDDirResolved)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeBuilDDirResolved)'))</XmakeBuilDDirResolved>
     <XmakeTargetDirResolved Condition="!$([System.IO.Path]::IsPathRooted('$(XmakeTargetDirResolved)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeTargetDirResolved)'))</XmakeTargetDirResolved>
     <XmakeConfigDirResolved Condition="!$([System.IO.Path]::IsPathRooted('$(XmakeConfigDirResolved)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeConfigDirResolved)'))</XmakeConfigDirResolved>
     <XmakeConfigFileDirResolved Condition="!$([System.IO.Path]::IsPathRooted('$(XmakeConfigFileDirResolved)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeConfigFileDirResolved)'))</XmakeConfigFileDirResolved>
     <XmakeRunDirResolved Condition="!$([System.IO.Path]::IsPathRooted('$(XmakeRunDirResolved)'))">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\$(XmakeRunDirResolved)'))</XmakeRunDirResolved>
 
     <!-- normalize paths -->
-    <XmakeBuilDirResolved>$([System.IO.Path]::GetFullPath('$(XmakeBuilDirResolved)/'))</XmakeBuilDirResolved>
+    <XmakeBuilDDirResolved>$([System.IO.Path]::GetFullPath('$(XmakeBuilDDirResolved)/'))</XmakeBuilDDirResolved>
     <XmakeTargetDirResolved>$([System.IO.Path]::GetFullPath('$(XmakeTargetDirResolved)/'))</XmakeTargetDirResolved>
     <XmakeConfigDirResolved>$([System.IO.Path]::GetFullPath('$(XmakeConfigDirResolved)/'))</XmakeConfigDirResolved>
     <XmakeConfigFileDirResolved>$([System.IO.Path]::GetFullPath('$(XmakeConfigFileDirResolved)/'))</XmakeConfigFileDirResolved>
@@ -44,7 +44,7 @@
     <_XmakeCommonFlags Condition="$(XmakeDiagnosis)">-D $(_XmakeCommonFlags.Trim())</_XmakeCommonFlags>
     <_XmakeCommonFlags>-y $(_XmakeCommonFlags.Trim()) $(_XmakeProjectFlag)</_XmakeCommonFlags>
 
-    <_XmakeOutFlag>-o "$([MSBuild]::MakeRelative('$(XmakeProjectDirResolved)', '$(XmakeBuilDirResolved)').TrimEnd('\').TrimEnd('/'))"</_XmakeOutFlag>
+    <_XmakeOutFlag>-o "$([MSBuild]::MakeRelative('$(XmakeProjectDirResolved)', '$(XmakeBuilDDirResolved)').TrimEnd('\').TrimEnd('/'))"</_XmakeOutFlag>
 
     <_XmakeConfigFlags>$(XmakeConfigFlags.Trim())</_XmakeConfigFlags>
     <_XmakeConfigFlags>-p $(XmakePlat) -m $(XmakeMode) -a $(XmakeArch) $(_XmakeOutFlag) $(_XmakeConfigFlags.Trim())</_XmakeConfigFlags>
@@ -156,7 +156,7 @@ MSBuild Properties:
     XmakeProgramFile: $(XmakeProgramFile)
     XmakeProjectDir: $(XmakeProjectDir)
     XmakeScriptDir: $(XmakeScriptDir)
-    XmakeBuilDir: $(XmakeBuilDir)
+    XmakeBuilDDir: $(XmakeBuilDDir)
     XmakeTargetDir: $(XmakeTargetDir)
     XmakeConfigDir: $(XmakeConfigDir)
     XmakeConfigFileDir: $(XmakeConfigFileDir)
@@ -166,7 +166,7 @@ MSBuild Properties:
     XmakeProgramFile: $(XmakeProgramFileResolved)
     XmakeProjectDir: $(XmakeProjectDirResolved)
     XmakeScriptDir: $(XmakeScriptDirResolved)
-    XmakeBuilDir: $(XmakeBuilDirResolved)
+    XmakeBuilDDir: $(XmakeBuilDDirResolved)
     XmakeTargetDir: $(XmakeTargetDirResolved)
     XmakeConfigDir: $(XmakeConfigDirResolved)
     XmakeConfigFileDir: $(XmakeConfigFileDirResolved)
diff --git a/xmake/scripts/vsxmake/vsproj/Xmake.xml b/xmake/scripts/vsxmake/vsproj/Xmake.xml
index 2b7fea645..3f5600ba6 100644
--- a/xmake/scripts/vsxmake/vsproj/Xmake.xml
+++ b/xmake/scripts/vsxmake/vsproj/Xmake.xml
@@ -66,7 +66,7 @@
       Description="Set environment XMAKE_CONFIGDIR for xmake tasks"
       Subtype="folder" />
     <StringProperty
-      Name="XmakeBuilDir"
+      Name="XmakeBuilDDir"
       DisplayName="Build dir"
       Category="Paths"
       Description="Set output dir for xmake tasks"
diff --git a/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props
index 0018c3134..22e84fc46 100644
--- a/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props
+++ b/xmake/scripts/vsxmake/vsproj/templates/Xmake.Custom.props
@@ -9,7 +9,7 @@
     <!-- <XmakeConfigDir Condition="'$(XmakeMode)|$(XmakeArch)' == 'release|x86'">$(XmakeProjectDir)\.xmake</XmakeConfigDir> -->
 
     <!-- set output dir for xmake tasks -->
-    <!-- <XmakeBuilDir>$(XmakeProjectDir)\build</XmakeBuilDir> -->
+    <!-- <XmakeBuilDDir>$(XmakeProjectDir)\build</XmakeBuilDDir> -->
   </PropertyGroup>
 
   <PropertyGroup Label="XmakeFlags">
diff --git a/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch) b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
index 9afa8460f..f724ee28c 100644
--- a/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
+++ b/xmake/scripts/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
@@ -1,5 +1,5 @@
   <PropertyGroup Label="XmakePath" Condition="'$(Configuration)|$(Platform)'=='#mode#|#vsarch#'">
-    <XmakeBuilDir>#buildir#</XmakeBuilDir>
+    <XmakeBuilDDir>#builddir#</XmakeBuilDDir>
     <XmakeConfigDir>#configdir#</XmakeConfigDir>
     <XmakeConfigFileDir>#configfiledir#</XmakeConfigFileDir>
     <XmakeTargetDir>#targetdir#</XmakeTargetDir>