diff options
27 files changed, 71 insertions, 71 deletions
diff --git a/xmake/actions/config/configfiles.lua b/xmake/actions/config/configfiles.lua index 2262cdb35..78ff3ebec 100644 --- a/xmake/actions/config/configfiles.lua +++ b/xmake/actions/config/configfiles.lua @@ -181,7 +181,7 @@ function _preprocess_define_value(name, value, opt) if extraconf.quote == false then quote = false end - -- escape path seperator when with quote, @see https://github.com/xmake-io/xmake/issues/1872 + -- escape path separator when with quote, @see https://github.com/xmake-io/xmake/issues/1872 if quote and extraconf.escape then escape = true end diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua index 76db5d866..4c9f5ea4b 100644 --- a/xmake/actions/config/xmake.lua +++ b/xmake/actions/config/xmake.lua @@ -198,7 +198,7 @@ task("config") , "e.g." , " - i386-mingw32-" , " - arm-linux-androideabi-"}, - {nil, "target_os", "kv", nil, "Set target os only for cross-complation"}, + {nil, "target_os", "kv", nil, "Set target os only for cross-compilation"}, {nil, "bin", "kv", nil, "Set cross toolchains bin directory" , "e.g." , " - sdk/bin (/arm-linux-gcc ..)"}, diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua index 1766d28f5..142ddd338 100644 --- a/xmake/core/base/os.lua +++ b/xmake/core/base/os.lua @@ -1537,7 +1537,7 @@ function os.addenv(name, ...) end end --- set values to environment variable with the given seperator +-- set values to environment variable with the given separator function os.setenvp(name, values, sep) sep = sep or path.envsep() local ok = os._setenv(name, table.concat(table.wrap(values), sep)) @@ -1547,7 +1547,7 @@ function os.setenvp(name, values, sep) return ok end --- add values to environment variable with the given seperator +-- add values to environment variable with the given separator function os.addenvp(name, values, sep) sep = sep or path.envsep() values = table.wrap(values) diff --git a/xmake/core/base/path.lua b/xmake/core/base/path.lua index 9dc2ecd7d..5af6daec9 100644 --- a/xmake/core/base/path.lua +++ b/xmake/core/base/path.lua @@ -299,7 +299,7 @@ function path.split(p) return p:split("[/\\]") end --- get the path seperator +-- get the path separator function path.sep() local sep = path._SEP if not sep then @@ -309,7 +309,7 @@ function path.sep() return sep end --- get the path seperator of environment variable +-- get the path separator of environment variable function path.envsep() local envsep = path._ENVSEP if not envsep then @@ -379,7 +379,7 @@ function path.joinenv(paths, envsep) end end --- the last character is the path seperator? +-- the last character is the path separator? function path.islastsep(p) p = tostring(p) local sep = p:sub(#p, #p) diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua index 43b825583..7058b4190 100644 --- a/xmake/core/project/project.lua +++ b/xmake/core/project/project.lua @@ -87,7 +87,7 @@ function project._api_is_arch(interp, ...) return config.is_arch(...) end --- the current platform and architecture is cross-complation? +-- the current platform and architecture is cross-compilation? function project._api_is_cross(interp) return config.is_cross() end diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 3f78174a3..aa204a054 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -1903,7 +1903,7 @@ function _instance:filerules(sourcefile) end end - -- we will use overrided rules first, e.g. add_rules("xxx", {override = true}) + -- we will use overridden rules first, e.g. add_rules("xxx", {override = true}) return #rules_override > 0 and rules_override or rules end diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua index 51f8a733d..7bfcfd12a 100644 --- a/xmake/languages/asm/xmake.lua +++ b/xmake/languages/asm/xmake.lua @@ -86,23 +86,23 @@ language("asm") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "as", "kv", nil, "The Assembler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "ar", "kv", nil, "The Static Library Linker" } , {nil, "ld", "kv", nil, "The Linker" } , {nil, "sh", "kv", nil, "The Shared Library Linker" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "asflags", "kv", nil, "The Assembler Flags" } - , {category = "Cross Complation Configuration/Linker Flags Configuration" } + , {category = "Cross Compilation Configuration/Linker Flags Configuration" } , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } , {nil, "arflags", "kv", nil, "The Static Library Linker Flags" } , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } - , {category = "Cross Complation Configuration/Builin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua index 7b3085c73..b94a073b8 100644 --- a/xmake/languages/c++/xmake.lua +++ b/xmake/languages/c++/xmake.lua @@ -116,26 +116,26 @@ language("c++") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "cxx", "kv", nil, "The C++ Compiler" } , {nil, "cpp", "kv", nil, "The C/C++ Preprocessor" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "ld", "kv", nil, "The Linker" } , {nil, "ar", "kv", nil, "The Static Library Linker" } , {nil, "sh", "kv", nil, "The Shared Library Linker" } , {nil, "ranlib", "kv", nil, "The Static Library Index Generator" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "cxflags", "kv", nil, "The C/C++ compiler Flags" } , {nil, "cxxflags", "kv", nil, "The C++ Compiler Flags" } - , {category = "Cross Complation Configuration/Linker Flags Configuration" } + , {category = "Cross Compilation Configuration/Linker Flags Configuration" } , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } , {nil, "arflags", "kv", nil, "The Static Library Linker Flags" } , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/c/xmake.lua b/xmake/languages/c/xmake.lua index 9225add1c..85e97b445 100644 --- a/xmake/languages/c/xmake.lua +++ b/xmake/languages/c/xmake.lua @@ -117,26 +117,26 @@ language("c") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "cc", "kv", nil, "The C Compiler" } , {nil, "cpp", "kv", nil, "The C/C++ Preprocessor" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "ld", "kv", nil, "The Linker" } , {nil, "ar", "kv", nil, "The Static Library Linker" } , {nil, "sh", "kv", nil, "The Shared Library Linker" } , {nil, "ranlib", "kv", nil, "The Static Library Index Generator" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "cflags", "kv", nil, "The C Compiler Flags" } , {nil, "cxflags", "kv", nil, "The C/C++ compiler Flags" } - , {category = "Cross Complation Configuration/Linker Flags Configuration" } + , {category = "Cross Compilation Configuration/Linker Flags Configuration" } , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } , {nil, "arflags", "kv", nil, "The Static Library Linker Flags" } , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/csharp/xmake.lua b/xmake/languages/csharp/xmake.lua index 9c2c0ce22..dee30d9c4 100644 --- a/xmake/languages/csharp/xmake.lua +++ b/xmake/languages/csharp/xmake.lua @@ -56,17 +56,17 @@ language("csharp") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "cs", "kv", nil, "The C# Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "ld", "kv", nil, "The Linker" } , {nil, "sh", "kv", nil, "The Shared Library Linker" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "csflags", "kv", nil, "The C# Compiler Flags" } - , {category = "Cross Complation Configuration/Linker Flags Configuration" } + , {category = "Cross Compilation Configuration/Linker Flags Configuration" } , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } } diff --git a/xmake/languages/cuda/xmake.lua b/xmake/languages/cuda/xmake.lua index 7853f2ba3..ae43f7fc0 100644 --- a/xmake/languages/cuda/xmake.lua +++ b/xmake/languages/cuda/xmake.lua @@ -98,16 +98,16 @@ language("cuda") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "cu", "kv", nil, "The Cuda Compiler" } , {nil, "cu-ccbin", "kv", nil, "The Cuda Host C++ Compiler" } , {nil, "culd", "kv", nil, "The Cuda Linker" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "cuflags", "kv", nil, "The Cuda Compiler Flags" } , {nil, "culdflags", "kv", nil, "The Cuda Linker Flags" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/dlang/xmake.lua b/xmake/languages/dlang/xmake.lua index c7df96531..d2807fbc2 100644 --- a/xmake/languages/dlang/xmake.lua +++ b/xmake/languages/dlang/xmake.lua @@ -99,15 +99,15 @@ language("dlang") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "dc", "kv", nil, "The Dlang Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "dcld", "kv", nil, "The Dlang Linker" } , {nil, "dcar", "kv", nil, "The Dlang Static Library Archiver" } , {nil, "dcsh", "kv", nil, "The Dlang Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/fortran/xmake.lua b/xmake/languages/fortran/xmake.lua index 2691fa3b0..7c60837a7 100644 --- a/xmake/languages/fortran/xmake.lua +++ b/xmake/languages/fortran/xmake.lua @@ -79,14 +79,14 @@ language("fortran") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "fc", "kv", nil, "The Fortran Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "fcld", "kv", nil, "The Fortran Linker" } , {nil, "fcsh", "kv", nil, "The Fortran Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua index 21893723f..4878eccbc 100644 --- a/xmake/languages/golang/xmake.lua +++ b/xmake/languages/golang/xmake.lua @@ -77,14 +77,14 @@ language("golang") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "go", "kv", nil, "The Golang Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "gcld", "kv", nil, "The Golang Linker" } , {nil, "go-ar", "kv", nil, "The Golang Static Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/kotlin/xmake.lua b/xmake/languages/kotlin/xmake.lua index 29c9e9e64..53cefb466 100644 --- a/xmake/languages/kotlin/xmake.lua +++ b/xmake/languages/kotlin/xmake.lua @@ -93,15 +93,15 @@ language("kotlin") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "kc", "kv", nil, "The Rust Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "kcld", "kv", nil, "The Rust Linker" } , {nil, "kcar", "kv", nil, "The Rust Static Library Archiver" } , {nil, "kcsh", "kv", nil, "The Rust Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } } } diff --git a/xmake/languages/msrc/xmake.lua b/xmake/languages/msrc/xmake.lua index 3647bbb17..6d275d08a 100644 --- a/xmake/languages/msrc/xmake.lua +++ b/xmake/languages/msrc/xmake.lua @@ -44,13 +44,13 @@ language("msrc") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "mrc", "kv", nil, "The Microsoft Resource Compiler" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "mrcflags", "kv", nil, "The Microsoft Resource Flags" } - , {category = "Cross Complation Configuration/Builti Flags Configuration" } + , {category = "Cross Compilation Configuration/Builti Flags Configuration" } , {nil, "includedirs","kv", nil, "The Include Search Directories" } } } diff --git a/xmake/languages/nim/xmake.lua b/xmake/languages/nim/xmake.lua index 458cd1d33..13776c22f 100644 --- a/xmake/languages/nim/xmake.lua +++ b/xmake/languages/nim/xmake.lua @@ -85,15 +85,15 @@ language("nim") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "nc", "kv", nil, "The Nim Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "ncld", "kv", nil, "The Nim Linker" } , {nil, "ncar", "kv", nil, "The Nim Static Library Archiver" } , {nil, "ncsh", "kv", nil, "The Nim Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } } } diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index d4a945312..f26496e53 100644 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -132,26 +132,26 @@ language("objc++") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "mm", "kv", nil, "The Objc Compiler" } , {nil, "mxx", "kv", nil, "The Objc++ Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "ld", "kv", nil, "The Linker" } , {nil, "ar", "kv", nil, "The Static Library Linker" } , {nil, "sh", "kv", nil, "The Shared Library Linker" } - , {category = "Cross Complation Configuration/Compiler Flags Configuration" } + , {category = "Cross Compilation Configuration/Compiler Flags Configuration" } , {nil, "mflags", "kv", nil, "The Objc Compiler Flags" } , {nil, "mxflags", "kv", nil, "The Objc/c++ Compiler Flags" } , {nil, "mxxflags", "kv", nil, "The Objc++ Compiler Flags" } - , {category = "Cross Complation Configuration/Linker Flags Configuration" } + , {category = "Cross Compilation Configuration/Linker Flags Configuration" } , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } , {nil, "arflags", "kv", nil, "The Static Library Linker Flags" } , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/pascal/xmake.lua b/xmake/languages/pascal/xmake.lua index de31378af..0c207c49e 100644 --- a/xmake/languages/pascal/xmake.lua +++ b/xmake/languages/pascal/xmake.lua @@ -108,14 +108,14 @@ language("pascal") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "pc", "kv", nil, "The Pascal Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "pcld", "kv", nil, "The Pascal Linker" } , {nil, "pcsh", "kv", nil, "The Pascal Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/rust/xmake.lua b/xmake/languages/rust/xmake.lua index 09eb9e80e..c770a110f 100644 --- a/xmake/languages/rust/xmake.lua +++ b/xmake/languages/rust/xmake.lua @@ -97,15 +97,15 @@ language("rust") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "rc", "kv", nil, "The Rust Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "rcld", "kv", nil, "The Rust Linker" } , {nil, "rcar", "kv", nil, "The Rust Static Library Archiver" } , {nil, "rcsh", "kv", nil, "The Rust Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } } } diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua index a00810111..abd1e1bf7 100644 --- a/xmake/languages/swift/xmake.lua +++ b/xmake/languages/swift/xmake.lua @@ -99,15 +99,15 @@ language("swift") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , { nil, "sc", "kv", nil, "The Swift Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , { nil, "scld", "kv", nil, "The Swift Linker" } , { nil, "scsh", "kv", nil, "The Swift Shared Library Linker" } , { nil, "scar", "kv", nil, "The Swift Static Library Archiver" } - , { category = "Cross Complation Configuration/Builtin Flags Configuration" } + , { category = "Cross Compilation Configuration/Builtin Flags Configuration" } , { nil, "links", "kv", nil, "The Link Libraries" } , { nil, "syslinks", "kv", nil, "The System Link Libraries" } , { nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/zig/xmake.lua b/xmake/languages/zig/xmake.lua index c87cb5b26..32f522d82 100644 --- a/xmake/languages/zig/xmake.lua +++ b/xmake/languages/zig/xmake.lua @@ -73,15 +73,15 @@ language("zig") set_menu { config = { - {category = "Cross Complation Configuration/Compiler Configuration" } + {category = "Cross Compilation Configuration/Compiler Configuration" } , {nil, "zc", "kv", nil, "The Zig Compiler" } - , {category = "Cross Complation Configuration/Linker Configuration" } + , {category = "Cross Compilation Configuration/Linker Configuration" } , {nil, "zcld", "kv", nil, "The Zig Linker" } , {nil, "zcar", "kv", nil, "The Zig Static Library Archiver" } , {nil, "zcsh", "kv", nil, "The Zig Shared Library Linker" } - , {category = "Cross Complation Configuration/Builtin Flags Configuration" } + , {category = "Cross Compilation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "syslinks", "kv", nil, "The System Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua index f5d547341..fb2676e0e 100644 --- a/xmake/modules/core/tools/dmd.lua +++ b/xmake/modules/core/tools/dmd.lua @@ -266,7 +266,7 @@ function compile(self, sourcefile, objectfile, dependinfo, flags, opt) -- generate the dependent includes if depfile and os.isfile(depfile) then if dependinfo then - -- it use makefile/gcc compatiable format + -- it use makefile/gcc compatible format dependinfo.depfiles_format = "gcc" dependinfo.depfiles = io.readfile(depfile, {continuation = "\\"}) end diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 120467b7d..c2fc26954 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -607,7 +607,7 @@ function buildenvs(package, opt) -- fix PKG_CONFIG_PATH for windows/msys2 -- @see https://github.com/xmake-io/xmake-repo/issues/3442 if package:is_plat("windows") then - -- pkg-config can only support for unix path and env seperator on msys/cygwin + -- pkg-config can only support for unix path and env separator on msys/cygwin PKG_CONFIG_PATH = _translate_cygwin_paths(PKG_CONFIG_PATH) envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH, ":") else diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index 676bd8be5..94f8007b3 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -231,7 +231,7 @@ function _fix_paths_for_precompiled_package(package) for _, file in ipairs(os.files(filepattern)) do if remote_prefix then local _, count = io.replace(file, remote_prefix, local_prefix, {plain = true}) - -- maybe we need to translate path seperator + -- maybe we need to translate path separator -- @see https://github.com/xmake-io/xmake/discussions/3008 if count == 0 and is_host("windows") then io.replace(file, (remote_prefix:gsub("\\", "/")), local_prefix:gsub("\\", "/"), {plain = true}) diff --git a/xmake/modules/private/action/trybuild/autoconf.lua b/xmake/modules/private/action/trybuild/autoconf.lua index f4771f060..313d12fe6 100644 --- a/xmake/modules/private/action/trybuild/autoconf.lua +++ b/xmake/modules/private/action/trybuild/autoconf.lua @@ -200,7 +200,7 @@ function _get_configs(artifacts_dir) end end - -- add host for cross-complation + -- add host for cross-compilation if _is_cross_compilation() then if is_plat("iphoneos", "macosx") then local triples = diff --git a/xmake/rules/csharp/build.lua b/xmake/rules/csharp/build.lua index 9bc6f2e76..a23cf4211 100644 --- a/xmake/rules/csharp/build.lua +++ b/xmake/rules/csharp/build.lua @@ -15,7 +15,7 @@ -- Copyright (C) 2015-present, Xmake Open Source Community. -- -- @author ruki --- @file target.lua +-- @file build.lua -- -- imports |