summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-09-25 00:50:35 +0800
committerruki <[email protected]>2020-09-25 00:50:35 +0800
commit475233c8d4ca369e967c102558068392c9e496e8 (patch)
tree7c545db4f3dfe5a30891b538659e7893f1af446e
parentba3a8eba461121eed5028f3e1f5c426fda348637 (diff)
rename some pathes to paths
-rw-r--r--core/src/xmake/os/find.c2
-rw-r--r--scripts/installer.nsi2
-rw-r--r--xmake/core/base/path.lua4
-rw-r--r--xmake/core/main.lua2
-rw-r--r--xmake/modules/detect/packages/find_zlib.lua8
-rw-r--r--xmake/modules/detect/tools/find_sdcc.lua12
-rw-r--r--xmake/modules/private/utils/bcsave.lua2
7 files changed, 16 insertions, 16 deletions
diff --git a/core/src/xmake/os/find.c b/core/src/xmake/os/find.c
index ed57e70c1..09a0961ce 100644
--- a/core/src/xmake/os/find.c
+++ b/core/src/xmake/os/find.c
@@ -97,7 +97,7 @@ static tb_bool_t xm_os_find_walk(tb_char_t const* path, tb_file_info_t const* in
if (tb_strcmp(rootdir, "."))
path += rootlen + 1;
- // exclude pathes
+ // exclude paths
tb_int_t i = 0;
tb_int_t count = (tb_int_t)lua_objlen(lua, 5);
for (i = 0; i < count && !excluded; i++)
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index 0555007da..7cafc82ae 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -148,7 +148,7 @@ VIAddVersionKey /LANG=0 ProductVersion ${VERSION_FULL}
;--------------------------------
-; Reg pathes
+; Reg paths
!define RegUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall\XMake"
diff --git a/xmake/core/base/path.lua b/xmake/core/base/path.lua
index 376797719..2ebd0ae70 100644
--- a/xmake/core/base/path.lua
+++ b/xmake/core/base/path.lua
@@ -112,7 +112,7 @@ function path.envsep()
end
-- split environment variable with `path.envsep()`,
--- also handles more speical cases such as posix flags and windows quoted pathes
+-- also handles more speical cases such as posix flags and windows quoted paths
function path.splitenv(env_path)
local result = {}
if xmake._HOST == "windows" then
@@ -149,7 +149,7 @@ function path.splitenv(env_path)
end
-- concat environment variable with `path.envsep()`,
--- also handles more speical cases such as posix flags and windows quoted pathes
+-- also handles more speical cases such as posix flags and windows quoted paths
function path.joinenv(env_table)
-- check
diff --git a/xmake/core/main.lua b/xmake/core/main.lua
index 04bdbc136..935b78cca 100644
--- a/xmake/core/main.lua
+++ b/xmake/core/main.lua
@@ -144,7 +144,7 @@ function main._init()
return false, err
end
- -- init project pathes only for xmake engine
+ -- init project paths only for xmake engine
if xmake._NAME == "xmake" then
local opt_projectdir, opt_projectfile = options.project, options.file
diff --git a/xmake/modules/detect/packages/find_zlib.lua b/xmake/modules/detect/packages/find_zlib.lua
index 8624c7bdd..88205b60c 100644
--- a/xmake/modules/detect/packages/find_zlib.lua
+++ b/xmake/modules/detect/packages/find_zlib.lua
@@ -37,14 +37,14 @@ function main(opt)
--
if opt.plat == "windows" then
- -- init search pathes
- local pathes = {"$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath)",
+ -- init search paths
+ local paths = {"$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath)",
"$(env PROGRAMFILES)/GnuWin32",
"$(env PROGRAMFILES)/zlib"}
-- find library
local result = {links = {}, linkdirs = {}, includedirs = {}}
- local linkinfo = find_library("zlib", pathes, {suffixes = "lib"})
+ local linkinfo = find_library("zlib", paths, {suffixes = "lib"})
if not linkinfo then
return
end
@@ -54,7 +54,7 @@ function main(opt)
table.insert(result.linkdirs, linkinfo.linkdir)
-- find include
- local includedir = find_path("zlib.h", pathes, {suffixes = "include"})
+ local includedir = find_path("zlib.h", paths, {suffixes = "include"})
if includedir then
-- save include directory
diff --git a/xmake/modules/detect/tools/find_sdcc.lua b/xmake/modules/detect/tools/find_sdcc.lua
index a6f7bbd8b..5c2867d02 100644
--- a/xmake/modules/detect/tools/find_sdcc.lua
+++ b/xmake/modules/detect/tools/find_sdcc.lua
@@ -40,17 +40,17 @@ function main(opt)
opt = opt or {}
opt.command = opt.command or "--version"
- -- add search pathes
- local pathes = {}
+ -- add search paths
+ local paths = {}
local bindir = get_config("bin")
if bindir and os.isdir(bindir) then
- table.insert(pathes, bindir)
+ table.insert(paths, bindir)
end
if is_host("windows") then
- table.insert(pathes, "$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\SDCC)\\bin")
+ table.insert(paths, "$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\SDCC)\\bin")
end
- if #pathes > 0 then
- opt.pathes = pathes
+ if #paths > 0 then
+ opt.pathes = paths
end
-- find program
diff --git a/xmake/modules/private/utils/bcsave.lua b/xmake/modules/private/utils/bcsave.lua
index 145395d5b..b0d5f400b 100644
--- a/xmake/modules/private/utils/bcsave.lua
+++ b/xmake/modules/private/utils/bcsave.lua
@@ -64,7 +64,7 @@ function save(sourcedir, outputdir, opt)
local bcfile = override and os.tmpfile() or path.join(outputdir, relativepath)
-- generate bitcode file
- -- @note we disable cache to ensure all display pathes are correct
+ -- @note we disable cache to ensure all display paths are correct
bcsave(luafile, bcfile, {strip = opt.strip, displaypath = displaypath, nocache = true})
-- trace