Merge pull request #6361 from xmake-io/builddir

Rename buildir to builddir

5 files changed, 14 insertions, 14 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