diff options
| author | ruki <[email protected]> | 2022-02-24 11:05:48 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-24 11:05:48 +0800 |
| commit | 78b85377c2bdea24d266b5a43b3ee802bc9724cb (patch) | |
| tree | 7230f08c1720db98655b90fa4dd98a80e9b9b37a | |
| parent | 465fee4cbf4b72419c8a717e05a4879e79ac772e (diff) | |
| parent | 53eb656616818f8980ee1cc12d55d1f7671d741c (diff) | |
Merge pull request #2083 from cyfdecyf/dev
Fix some typos.
| -rw-r--r-- | xmake/core/base/interpreter.lua | 2 | ||||
| -rw-r--r-- | xmake/core/package/package.lua | 2 | ||||
| -rw-r--r-- | xmake/core/sandbox/modules/import/core/project/project.lua | 2 | ||||
| -rw-r--r-- | xmake/toolchains/cross/xmake.lua | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua index 506d8cdad..8a4ed906c 100644 --- a/xmake/core/base/interpreter.lua +++ b/xmake/core/base/interpreter.lua @@ -1469,7 +1469,7 @@ function interpreter:api_define(apis) for apitype, apifuncs in pairs(apis) do for _, apifunc in ipairs(apifuncs) do - -- is {"apifunc", apiscipt}? + -- is {"apifunc", apiscript}? local apiscript = nil if type(apifunc) == "table" then diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 20a5c0ff7..dd2542b98 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -536,7 +536,7 @@ function _instance:lock(opt) if self:filelock():trylock(opt) then return true else - utils.cprint("${color.warning}package(%s) is being accessed by other processes, please waiting!", self:name()) + utils.cprint("${color.warning}package(%s) is being accessed by other processes, please wait!", self:name()) end local ok, errors = self:filelock():lock(opt) if not ok then diff --git a/xmake/core/sandbox/modules/import/core/project/project.lua b/xmake/core/sandbox/modules/import/core/project/project.lua index f515b3e74..46c9b973d 100644 --- a/xmake/core/sandbox/modules/import/core/project/project.lua +++ b/xmake/core/sandbox/modules/import/core/project/project.lua @@ -137,7 +137,7 @@ function sandbox_core_project.lock(opt) if sandbox_core_project.trylock(opt) then return true elseif baseoption.get("diagnosis") then - utils.cprint("${color.warning}the current project is being accessed by other processes, please waiting!") + utils.cprint("${color.warning}the current project is being accessed by other processes, please wait!") io.flush() end local ok, errors = sandbox_core_project.filelock():lock(opt) diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua index 3ec12f1f4..1e694e2b3 100644 --- a/xmake/toolchains/cross/xmake.lua +++ b/xmake/toolchains/cross/xmake.lua @@ -21,7 +21,7 @@ -- define toolchain toolchain("cross") - -- set descrption + -- set description set_description("Common cross compilation toolchain") -- mark as cross-compilation toolchain |