summaryrefslogtreecommitdiff
path: root/xmake/modules/core
diff options
context:
space:
mode:
authorwtz <[email protected]>2023-07-19 12:35:52 +0800
committerwtz <[email protected]>2023-07-19 12:35:52 +0800
commitf75224a8435d0eb9cdda79f8bc571eeef25a8e33 (patch)
tree278e00b17c8f5558df1c1a21f1204078ea62a58f /xmake/modules/core
parentca83e9a78b7f2d45e833fa705c880867ad2381c6 (diff)
Fix grammar
Diffstat (limited to 'xmake/modules/core')
-rw-r--r--xmake/modules/core/project/depend.lua8
-rw-r--r--xmake/modules/core/tools/cl.lua8
-rw-r--r--xmake/modules/core/tools/gcc.lua12
-rw-r--r--xmake/modules/core/tools/ml.lua2
-rw-r--r--xmake/modules/core/tools/rc.lua2
5 files changed, 16 insertions, 16 deletions
diff --git a/xmake/modules/core/project/depend.lua b/xmake/modules/core/project/depend.lua
index 78150c117..9f386c8f1 100644
--- a/xmake/modules/core/project/depend.lua
+++ b/xmake/modules/core/project/depend.lua
@@ -73,7 +73,7 @@ function save(dependinfo, dependfile)
io.save(dependfile, dependinfo)
end
--- the dependent info is changed?
+-- Is the dependent info changed?
--
-- if not depend.is_changed(dependinfo, {filemtime = os.mtime(objectfile), values = {...}}) then
-- return
@@ -88,7 +88,7 @@ function is_changed(dependinfo, opt)
return true
end
- -- check the dependent files are changed?
+ -- check whether the dependent files are changed
local lastmtime = opt.lastmtime or 0
_g.files_mtime = _g.files_mtime or {}
local files_mtime = _g.files_mtime
@@ -104,7 +104,7 @@ function is_changed(dependinfo, opt)
end
end
- -- check the dependent values are changed?
+ -- check whether the dependent values are changed
local depvalues = values
local optvalues = table.wrap(opt.values)
if #depvalues ~= #optvalues then
@@ -127,7 +127,7 @@ function is_changed(dependinfo, opt)
end
end
- -- check the dependent files list are changed?
+ -- check whether the dependent files list are changed
if opt.files then
local optfiles = table.wrap(opt.files)
if #files ~= #optfiles then
diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua
index e5addc78a..e69b7d814 100644
--- a/xmake/modules/core/tools/cl.lua
+++ b/xmake/modules/core/tools/cl.lua
@@ -116,7 +116,7 @@ function nf_symbols(self, levels, target)
-- check and add symbol output file
--
- -- @note we need use `{}` to wrap it to avoid expand it
+ -- @note we need to use `{}` to wrap it to avoid expand it
-- https://github.com/xmake-io/xmake/issues/2061#issuecomment-1042590085
local pdbflags = {"-Fd" .. (target:is_static() and symbolfile or path.join(symboldir, "compile." .. path.filename(symbolfile)))}
if self:has_flags({"-FS", "-Fd" .. os.nuldev() .. ".pdb"}, "cxflags", { flagskey = "-FS -Fd" }) then
@@ -163,7 +163,7 @@ function nf_optimize(self, level)
none = "-Od"
, faster = "-Ox"
, fastest = "-O2 -fp:fast"
- , smallest = "-O1 -GL" -- /GL and (/OPT:REF is on by default in linker), we need enable /ltcg
+ , smallest = "-O1 -GL" -- /GL and (/OPT:REF is on by default in linker), we need to enable /ltcg
, aggressive = "-O2 -fp:fast"
}
return maps[level]
@@ -521,7 +521,7 @@ end
-- compile preprocessed file
function _compile_preprocessed_file(program, cppinfo, opt)
local outdata, errdata = vstool.iorunv(program, winos.cmdargv(table.join(cppinfo.cppflags, "-Fo" .. cppinfo.objectfile, cppinfo.cppfile)), opt)
- -- we need get warning information from output
+ -- we need to get warning information from output
cppinfo.outdata = outdata
cppinfo.errdata = errdata
end
@@ -592,7 +592,7 @@ function compile(self, sourcefile, objectfile, dependinfo, flags, opt)
end
end
- -- we need show full file path to goto error position if xmake is called in vstudio
+ -- we need to show full file path to goto error position if xmake is called in vstudio
-- https://github.com/xmake-io/xmake/issues/1049
if _is_in_vstudio() then
if compflags == flags then
diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index cfd5fac5c..60f6ac805 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -112,7 +112,7 @@ function nf_symbol(self, level)
end
return maps[level .. '_' .. kind] or maps[level]
elseif kind == "ld" or kind == "sh" then
- -- we need add `-g` to linker to generate pdb symbol file for mingw-gcc, llvm-clang on windows
+ -- we need to add `-g` to linker to generate pdb symbol file for mingw-gcc, llvm-clang on windows
local plat = self:plat()
if level == "debug" and (plat == "windows" or (plat == "mingw" and is_host("windows"))) then
return "-g"
@@ -426,7 +426,7 @@ end
-- link the target file
--
--- maybe we need use os.vrunv() to show link output when enable verbose information
+-- maybe we need to use os.vrunv() to show link output when enable verbose information
-- @see https://github.com/xmake-io/xmake/discussions/2916
--
function link(self, objectfiles, targetkind, targetfile, flags)
@@ -483,7 +483,7 @@ function _preprocess(program, argv, opt)
end
end
- -- enable "-fdirectives-only"? we need enable it manually
+ -- enable "-fdirectives-only"? we need to enable it manually
--
-- @see https://github.com/xmake-io/xmake/issues/2603
-- https://github.com/xmake-io/xmake/issues/2425
@@ -577,7 +577,7 @@ function _preprocess(program, argv, opt)
table.insert(cppflags, cppfile)
table.insert(cppflags, sourcefile)
- -- we need mark as it when compiling the preprocessed source file
+ -- we need to mark as it when compiling the preprocessed source file
-- it will indicate to the preprocessor that the input file has already been preprocessed.
if is_gcc then
table.insert(flags, "-fpreprocessed")
@@ -605,7 +605,7 @@ end
-- compile preprocessed file
function _compile_preprocessed_file(program, cppinfo, opt)
local outdata, errdata = os.iorunv(program, table.join(cppinfo.cppflags, "-o", cppinfo.objectfile, cppinfo.cppfile), opt)
- -- we need get warning information from output
+ -- we need to get warning information from output
cppinfo.outdata = outdata
cppinfo.errdata = errdata
end
@@ -672,7 +672,7 @@ end
-- get modules cache directory
function _modules_cachedir(target)
- if target and target.autogendir and target:data("cxx.has_modules") then -- we need ignore option instance
+ if target and target.autogendir and target:data("cxx.has_modules") then -- we need to ignore option instance
return path.join(target:autogendir(), "rules", "modules", "cache")
end
end
diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua
index 451954601..042937ed7 100644
--- a/xmake/modules/core/tools/ml.lua
+++ b/xmake/modules/core/tools/ml.lua
@@ -134,7 +134,7 @@ function compile(self, sourcefile, objectfile, dependinfo, flags)
try
{
function ()
- -- @note we need not uses vstool.runv to enable unicode output for ml.exe
+ -- @note we don't need to use vstool.runv to enable unicode output for ml.exe
local program, argv = compargv(self, sourcefile, objectfile, flags)
os.runv(program, argv, {envs = self:runenvs()})
end,
diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua
index 5ef03b912..55146ee76 100644
--- a/xmake/modules/core/tools/rc.lua
+++ b/xmake/modules/core/tools/rc.lua
@@ -93,7 +93,7 @@ function compile(self, sourcefile, objectfile, dependinfo, flags)
try
{
function ()
- -- @note we need not uses vstool.iorunv to enable unicode output for rc.exe
+ -- @note we don't need to use vstool.iorunv to enable unicode output for rc.exe
local program, argv = compargv(self, sourcefile, objectfile, flags)
local outdata, errdata = os.iorunv(program, argv, {envs = self:runenvs()})
return (outdata or "") .. (errdata or "")