diff options
| author | wtz <[email protected]> | 2023-07-19 12:35:52 +0800 |
|---|---|---|
| committer | wtz <[email protected]> | 2023-07-19 12:35:52 +0800 |
| commit | f75224a8435d0eb9cdda79f8bc571eeef25a8e33 (patch) | |
| tree | 278e00b17c8f5558df1c1a21f1204078ea62a58f /xmake/modules/private/tools | |
| parent | ca83e9a78b7f2d45e833fa705c880867ad2381c6 (diff) | |
Fix grammar
Diffstat (limited to 'xmake/modules/private/tools')
| -rw-r--r-- | xmake/modules/private/tools/cl/parse_deps.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/tools/cl/parse_deps_json.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/private/tools/gcc/parse_deps.lua | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/private/tools/cl/parse_deps.lua b/xmake/modules/private/tools/cl/parse_deps.lua index 5a0cfe27d..187d655cd 100644 --- a/xmake/modules/private/tools/cl/parse_deps.lua +++ b/xmake/modules/private/tools/cl/parse_deps.lua @@ -73,7 +73,7 @@ function _normailize_dep(dep, projectdir) if dep:startswith(projectdir) then return path.relative(dep, projectdir) else - -- we need also check header files outside project + -- we also need to check header files outside project -- https://github.com/xmake-io/xmake/issues/1154 return dep end diff --git a/xmake/modules/private/tools/cl/parse_deps_json.lua b/xmake/modules/private/tools/cl/parse_deps_json.lua index 459a8b112..50f728815 100644 --- a/xmake/modules/private/tools/cl/parse_deps_json.lua +++ b/xmake/modules/private/tools/cl/parse_deps_json.lua @@ -73,7 +73,7 @@ function _normailize_dep(dep, projectdir) if dep:startswith(projectdir) then return path.relative(dep, projectdir) else - -- we need also check header files outside project + -- we also need to check header files outside project -- https://github.com/xmake-io/xmake/issues/1154 return dep end @@ -132,7 +132,7 @@ function main(depsdata) -- translate it local results = hashset.new() - local projectdir = os.projectdir():lower() -- we need generate lower string, because json values are all lower + local projectdir = os.projectdir():lower() -- we need to generate lower string, because json values are all lower for _, includefile in ipairs(includes) do includefile = _normailize_dep(includefile, projectdir) if includefile then diff --git a/xmake/modules/private/tools/gcc/parse_deps.lua b/xmake/modules/private/tools/gcc/parse_deps.lua index 3bc067861..24ff67f09 100644 --- a/xmake/modules/private/tools/gcc/parse_deps.lua +++ b/xmake/modules/private/tools/gcc/parse_deps.lua @@ -35,7 +35,7 @@ function _normailize_dep(dep, projectdir) if dep:startswith(projectdir) then return path.relative(dep, projectdir) else - -- we need also check header files outside project + -- we also need to check header files outside project -- https://github.com/xmake-io/xmake/issues/1154 return dep end @@ -72,7 +72,7 @@ function main(depsdata, opt) local plain = {plain = true} line = line:replace("\\ ", space_placeholder, plain) for _, includefile in ipairs(line:split(' ', plain)) do -- it will trim all internal spaces without `{strict = true}` - -- some gcc toolchains will some invalid paths (e.g. `d\:\xxx`), we need fix it + -- some gcc toolchains will some invalid paths (e.g. `d\:\xxx`), we need to fix it -- https://github.com/xmake-io/xmake/issues/1196 if is_host("windows") and includefile:match("^%w\\:") then includefile = includefile:replace("\\:", ":", plain) |