diff options
| author | FrankHB <[email protected]> | 2019-08-11 18:06:42 +0800 |
|---|---|---|
| committer | FrankHB <[email protected]> | 2019-08-11 18:06:42 +0800 |
| commit | 0bdcae97d8d9b2b3afe725f9b857a9994d3b28fa (patch) | |
| tree | 4a3282446375c2a3e0165170f626a3ca827269bc | |
| parent | 35878524802b5144368f4bcad14264611a2fcff9 (diff) | |
fix typos
Changed all 'complie' to 'compile'. Added missing 'the' for some cases.
Signed-off-by: FrankHB <[email protected]>
| -rw-r--r-- | xmake/actions/build/kinds/object.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/core/tools/cl.lua | 14 | ||||
| -rw-r--r-- | xmake/modules/core/tools/cparser.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/dmd.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/core/tools/fasm.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/gcc.lua | 12 | ||||
| -rw-r--r-- | xmake/modules/core/tools/go.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/core/tools/llvm_rc.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/ml.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/nvcc.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/rc.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/rustc.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/core/tools/swiftc.lua | 6 | ||||
| -rw-r--r-- | xmake/modules/core/tools/tcc.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/windres.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/yasm.lua | 8 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs200x_vcproj.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua | 2 |
18 files changed, 62 insertions, 62 deletions
diff --git a/xmake/actions/build/kinds/object.lua b/xmake/actions/build/kinds/object.lua index 0cd207d1d..8f859054e 100644 --- a/xmake/actions/build/kinds/object.lua +++ b/xmake/actions/build/kinds/object.lua @@ -134,7 +134,7 @@ function _do_build_file(target, sourcefile, opt) -- flush io buffer to update progress info io.flush() - -- complie it + -- compile it dependinfo.files = {} assert(compinst:compile(sourcefile, objectfile, {dependinfo = dependinfo, compflags = compflags})) @@ -232,7 +232,7 @@ function _build_files_for_single(target, sourcebatch, jobs) print(compiler.compcmd(sourcefiles, objectfiles, {target = target, sourcekind = sourcekind})) end - -- complie them + -- compile them compiler.compile(sourcefiles, objectfiles, {dependfiles = dependfiles, target = target, sourcekind = sourcekind}) end diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index 0c139fc63..81065f9cf 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -338,7 +338,7 @@ function _include_deps(self, outdata) return results end --- make the complie arguments list for the precompiled header +-- make the compile arguments list for the precompiled header function _compargv1_pch(self, pcheaderfile, pcoutputfile, flags) -- remove "-Yuxxx.h" and "-Fpxxx.pch" @@ -356,11 +356,11 @@ function _compargv1_pch(self, pcheaderfile, pcoutputfile, flags) table.insert(pchflags, "-TP") end - -- make complie arguments list + -- make the compile arguments list return self:program(), table.join("-c", "-Yc", pchflags, "-Fp" .. pcoutputfile, "-Fo" .. pcoutputfile .. ".obj", pcheaderfile) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) -- precompiled header? @@ -369,11 +369,11 @@ function _compargv1(self, sourcefile, objectfile, flags) return _compargv1_pch(self, sourcefile, objectfile, flags) end - -- make complie arguments list + -- make the compile arguments list return self:program(), table.join("-c", flags, "-Fo" .. objectfile, sourcefile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -456,7 +456,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) end end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -466,7 +466,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/cparser.lua b/xmake/modules/core/tools/cparser.lua index 3b1730cc6..80b903949 100644 --- a/xmake/modules/core/tools/cparser.lua +++ b/xmake/modules/core/tools/cparser.lua @@ -155,7 +155,7 @@ function link(self, objectfiles, targetkind, targetfile, flags) os.runv(linkargv(self, objectfiles, targetkind, targetfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) -- get ccache @@ -184,7 +184,7 @@ function _compargv1(self, sourcefile, objectfile, flags) return program, argv end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -237,7 +237,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -247,7 +247,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua index 6f92b402d..7c039319e 100644 --- a/xmake/modules/core/tools/dmd.lua +++ b/xmake/modules/core/tools/dmd.lua @@ -161,12 +161,12 @@ function link(self, objectfiles, targetkind, targetfile, flags) os.runv(linkargv(self, objectfiles, targetkind, targetfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) return self:program(), table.join("-c", flags, "-of" .. objectfile, sourcefiles) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- ensure the object directory diff --git a/xmake/modules/core/tools/fasm.lua b/xmake/modules/core/tools/fasm.lua index 0d7437f10..59aee4f55 100644 --- a/xmake/modules/core/tools/fasm.lua +++ b/xmake/modules/core/tools/fasm.lua @@ -53,12 +53,12 @@ function nf_define(self, macro) return "-d" .. macro end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) return self:program(), table.join(flags, sourcefile, objectfile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -68,7 +68,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) os.runv(_compargv1(self, sourcefile, objectfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -78,7 +78,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua index 3ec12d580..31fd45ac5 100644 --- a/xmake/modules/core/tools/gcc.lua +++ b/xmake/modules/core/tools/gcc.lua @@ -329,7 +329,7 @@ function link(self, objectfiles, targetkind, targetfile, flags) end --- make the complie arguments list for the precompiled header +-- make the compile arguments list for the precompiled header function _compargv1_pch(self, pcheaderfile, pcoutputfile, flags) -- remove "-include xxx.h" and "-include-pch xxx.pch" @@ -352,11 +352,11 @@ function _compargv1_pch(self, pcheaderfile, pcoutputfile, flags) table.insert(pchflags, "c++-header") end - -- make complie arguments list + -- make the compile arguments list return self:program(), table.join("-c", pchflags, "-o", pcoutputfile, pcheaderfile) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) -- precompiled header? @@ -391,7 +391,7 @@ function _compargv1(self, sourcefile, objectfile, flags) return program, argv end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -475,7 +475,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -485,7 +485,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/go.lua b/xmake/modules/core/tools/go.lua index 62782f27d..fa6541898 100644 --- a/xmake/modules/core/tools/go.lua +++ b/xmake/modules/core/tools/go.lua @@ -115,12 +115,12 @@ function link(self, objectfiles, targetkind, targetfile, flags) os.runv(linkargv(self, objectfiles, targetkind, targetfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) return self:program(), table.join("tool", "compile", flags, "-o", objectfile, sourcefiles) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- ensure the object directory diff --git a/xmake/modules/core/tools/llvm_rc.lua b/xmake/modules/core/tools/llvm_rc.lua index 941cbaea7..ab072d507 100644 --- a/xmake/modules/core/tools/llvm_rc.lua +++ b/xmake/modules/core/tools/llvm_rc.lua @@ -47,12 +47,12 @@ function nf_includedir(self, dir) return "/I " .. os.args(dir) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) return self:program(), table.join(flags, "/FO", objectfile, sourcefile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -86,7 +86,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -96,7 +96,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua index 040df6fd7..6b4155e29 100644 --- a/xmake/modules/core/tools/ml.lua +++ b/xmake/modules/core/tools/ml.lua @@ -92,12 +92,12 @@ function nf_includedir(self, dir) return "-I" .. os.args(dir) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) return self:program(), table.join("-c", flags, "-Fo" .. objectfile, sourcefile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -107,7 +107,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) os.runv(_compargv1(self, sourcefile, objectfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -117,7 +117,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/nvcc.lua b/xmake/modules/core/tools/nvcc.lua index a2037e64b..ecbfe14f0 100644 --- a/xmake/modules/core/tools/nvcc.lua +++ b/xmake/modules/core/tools/nvcc.lua @@ -274,7 +274,7 @@ function link(self, objectfiles, targetkind, targetfile, flags) os.runv(linkargv(self, objectfiles, targetkind, targetfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) -- get ccache @@ -303,7 +303,7 @@ function _compargv1(self, sourcefile, objectfile, flags) return program, argv end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -381,7 +381,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -391,7 +391,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua index 65b4be3f7..2c72d0575 100644 --- a/xmake/modules/core/tools/rc.lua +++ b/xmake/modules/core/tools/rc.lua @@ -47,12 +47,12 @@ function nf_includedir(self, dir) return "-I" .. os.args(dir) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) return self:program(), table.join(flags, "-Fo" .. objectfile, sourcefile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -86,7 +86,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -96,7 +96,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/rustc.lua b/xmake/modules/core/tools/rustc.lua index 1bd5cf7eb..d3fbda362 100644 --- a/xmake/modules/core/tools/rustc.lua +++ b/xmake/modules/core/tools/rustc.lua @@ -99,12 +99,12 @@ function build(self, sourcefiles, targetkind, targetfile, flags) os.runv(buildargv(self, sourcefiles, targetkind, targetfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) return self:program(), table.join("--emit", "obj", flags, "-o", objectfile, sourcefiles) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- ensure the object directory diff --git a/xmake/modules/core/tools/swiftc.lua b/xmake/modules/core/tools/swiftc.lua index 91a788fb6..3f18c0b16 100644 --- a/xmake/modules/core/tools/swiftc.lua +++ b/xmake/modules/core/tools/swiftc.lua @@ -230,7 +230,7 @@ function _compargv1(self, sourcefile, objectfile, flags) return program, argv end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -240,7 +240,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) os.runv(_compargv1(self, sourcefile, objectfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -250,7 +250,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/tcc.lua b/xmake/modules/core/tools/tcc.lua index e7c11b645..51a11df93 100644 --- a/xmake/modules/core/tools/tcc.lua +++ b/xmake/modules/core/tools/tcc.lua @@ -155,7 +155,7 @@ function link(self, objectfiles, targetkind, targetfile, flags) os.runv(linkargv(self, objectfiles, targetkind, targetfile, flags)) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) -- get ccache @@ -184,7 +184,7 @@ function _compargv1(self, sourcefile, objectfile, flags) return program, argv end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -237,7 +237,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -247,7 +247,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/windres.lua b/xmake/modules/core/tools/windres.lua index 0ff86b5f7..c4e4290cd 100644 --- a/xmake/modules/core/tools/windres.lua +++ b/xmake/modules/core/tools/windres.lua @@ -47,12 +47,12 @@ function nf_includedir(self, dir) return "-I" .. os.args(dir) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) return self:program(), table.join(flags, sourcefile, objectfile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -86,7 +86,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -96,7 +96,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/modules/core/tools/yasm.lua b/xmake/modules/core/tools/yasm.lua index 2fd7f0507..d06026857 100644 --- a/xmake/modules/core/tools/yasm.lua +++ b/xmake/modules/core/tools/yasm.lua @@ -79,12 +79,12 @@ function nf_includedir(self, dir) return "-I" .. os.args(dir) end --- make the complie arguments list +-- make the compile arguments list function _compargv1(self, sourcefile, objectfile, flags) return self:program(), table.join(flags, "-o", objectfile, sourcefile) end --- complie the source file +-- compile the source file function _compile1(self, sourcefile, objectfile, dependinfo, flags) -- ensure the object directory @@ -123,7 +123,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) } end --- make the complie arguments list +-- make the compile arguments list function compargv(self, sourcefiles, objectfile, flags) -- only support single source file now @@ -133,7 +133,7 @@ function compargv(self, sourcefiles, objectfile, flags) return _compargv1(self, sourcefiles, objectfile, flags) end --- complie the source file +-- compile the source file function compile(self, sourcefiles, objectfile, dependinfo, flags) -- only support single source file now diff --git a/xmake/plugins/project/vstudio/impl/vs200x_vcproj.lua b/xmake/plugins/project/vstudio/impl/vs200x_vcproj.lua index d2066a659..106b97709 100644 --- a/xmake/plugins/project/vstudio/impl/vs200x_vcproj.lua +++ b/xmake/plugins/project/vstudio/impl/vs200x_vcproj.lua @@ -436,7 +436,7 @@ function _make_cxfile(vcprojfile, vsinfo, target, sourcefile, objectfile, vcproj vcprojfile:print("AdditionalOptions=\"%s\"", flags) vcprojfile:print("ObjectFile=\"%s\"", path.relative(path.absolute(objectfile), vcprojdir)) - -- complie as c++ if exists flag: /TP + -- compile as c++ if exists flag: /TP if flags:find("[%-|/]TP") then vcprojfile:print("CompileAs=\"2\"") end diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua index 6fea45987..8f6549281 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua @@ -331,7 +331,7 @@ function _make_source_options(vcxprojfile, flags, condition) end end - -- complie as c++ if exists flag: /TP + -- compile as c++ if exists flag: /TP if flagstr:find("[%-/]TP") then vcxprojfile:print("<CompileAs%s>CompileAsCpp</CompileAs>", condition) end |
