summaryrefslogtreecommitdiff
path: root/xmake/modules/lib
diff options
context:
space:
mode:
authorOpportunityLiu <[email protected]>2019-07-24 10:42:55 +0800
committerOpportunityLiu <[email protected]>2019-07-24 10:42:55 +0800
commitb1a47544b8f60c12541b8b5a0f4383639d348af3 (patch)
treeea52bf2d354a9d04405ef1fadf1d45b82f5a90af /xmake/modules/lib
parentae7d6509749944564b939bd36cf6ab895dcff0af (diff)
fix typo
Diffstat (limited to 'xmake/modules/lib')
-rw-r--r--xmake/modules/lib/detect/check_csnippets.lua2
-rw-r--r--xmake/modules/lib/detect/check_cxsnippets.lua2
-rw-r--r--xmake/modules/lib/detect/check_cxxsnippets.lua2
-rw-r--r--xmake/modules/lib/detect/features.lua4
-rw-r--r--xmake/modules/lib/detect/find_tool.lua2
-rw-r--r--xmake/modules/lib/detect/find_toolname.lua2
-rw-r--r--xmake/modules/lib/detect/has_cfuncs.lua2
-rw-r--r--xmake/modules/lib/detect/has_cincludes.lua2
-rw-r--r--xmake/modules/lib/detect/has_ctypes.lua2
-rw-r--r--xmake/modules/lib/detect/has_cxxfuncs.lua2
-rw-r--r--xmake/modules/lib/detect/has_cxxincludes.lua2
-rw-r--r--xmake/modules/lib/detect/has_cxxtypes.lua2
-rw-r--r--xmake/modules/lib/detect/has_features.lua2
-rw-r--r--xmake/modules/lib/detect/has_flags.lua8
14 files changed, 18 insertions, 18 deletions
diff --git a/xmake/modules/lib/detect/check_csnippets.lua b/xmake/modules/lib/detect/check_csnippets.lua
index 364b09f51..acaf6f7e8 100644
--- a/xmake/modules/lib/detect/check_csnippets.lua
+++ b/xmake/modules/lib/detect/check_csnippets.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxsnippets")
--
-- @param snippets the snippets
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option]
-- , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}
-- , configs = {defines = "xx", cxflags = ""}}
diff --git a/xmake/modules/lib/detect/check_cxsnippets.lua b/xmake/modules/lib/detect/check_cxsnippets.lua
index dd2bf6cd1..6615c477c 100644
--- a/xmake/modules/lib/detect/check_cxsnippets.lua
+++ b/xmake/modules/lib/detect/check_cxsnippets.lua
@@ -113,7 +113,7 @@ end
--
-- @param snippets the snippets
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], sourcekind = "[cc|cxx]"
-- , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}
-- , configs = {defines = "xx", cxflags = ""}}
diff --git a/xmake/modules/lib/detect/check_cxxsnippets.lua b/xmake/modules/lib/detect/check_cxxsnippets.lua
index 06d9f6c4b..e0301ebc4 100644
--- a/xmake/modules/lib/detect/check_cxxsnippets.lua
+++ b/xmake/modules/lib/detect/check_cxxsnippets.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxsnippets")
--
-- @param snippets the snippets
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option]
-- , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}
-- , configs = {defines = "xx", cxflags = ""}}
diff --git a/xmake/modules/lib/detect/features.lua b/xmake/modules/lib/detect/features.lua
index 24534787f..3a9806b5e 100644
--- a/xmake/modules/lib/detect/features.lua
+++ b/xmake/modules/lib/detect/features.lua
@@ -24,7 +24,7 @@ import("lib.detect.find_tool")
-- get all features of the current tool
--
-- @param name the tool name
--- @param opt the argument options, .e.g {program = "", flags = {}}
+-- @param opt the argument options, e.g. {program = "", flags = {}}
--
-- @return the features dictionary
--
@@ -56,7 +56,7 @@ function main(name, opt)
_g._RESULTS = _g._RESULTS or {}
local results = _g._RESULTS
- -- @note avoid detect the same program in the same time if running in the coroutine (.e.g ccache)
+ -- @note avoid detect the same program in the same time if running in the coroutine (e.g. ccache)
local coroutine_running = coroutine.running()
if coroutine_running then
while _g._checking ~= nil and _g._checking == key do
diff --git a/xmake/modules/lib/detect/find_tool.lua b/xmake/modules/lib/detect/find_tool.lua
index d53e797b2..831884384 100644
--- a/xmake/modules/lib/detect/find_tool.lua
+++ b/xmake/modules/lib/detect/find_tool.lua
@@ -39,7 +39,7 @@ end
-- find tool
--
-- @param name the tool name
--- @param opt the options, .e.g {program = "xcrun -sdk macosx clang", pathes = {"/usr/bin"},
+-- @param opt the options, e.g. {program = "xcrun -sdk macosx clang", pathes = {"/usr/bin"},
-- check = function (tool) os.run("%s -h", tool) end, version = true
-- force = true, cachekey = "xxx"}
--
diff --git a/xmake/modules/lib/detect/find_toolname.lua b/xmake/modules/lib/detect/find_toolname.lua
index 02a1df105..474732705 100644
--- a/xmake/modules/lib/detect/find_toolname.lua
+++ b/xmake/modules/lib/detect/find_toolname.lua
@@ -68,7 +68,7 @@ end
-- find tool name
--
--- .e.g
+-- e.g.
-- "xcrun -sdk macosx clang": clang
-- "/usr/bin/arm-linux-gcc": gcc
-- "link.exe -lib": link
diff --git a/xmake/modules/lib/detect/has_cfuncs.lua b/xmake/modules/lib/detect/has_cfuncs.lua
index af1447852..86b67dce9 100644
--- a/xmake/modules/lib/detect/has_cfuncs.lua
+++ b/xmake/modules/lib/detect/has_cfuncs.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_csnippets")
--
-- @param funcs the funcs
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], includes = "", configs = {linkdirs = .., links = .., defines = .., ..}}
--
-- funcs:
diff --git a/xmake/modules/lib/detect/has_cincludes.lua b/xmake/modules/lib/detect/has_cincludes.lua
index 35817069a..7f4f67816 100644
--- a/xmake/modules/lib/detect/has_cincludes.lua
+++ b/xmake/modules/lib/detect/has_cincludes.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxsnippets")
--
-- @param includes the includes
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], configs = {defines = "..", .. }}
--
-- @return true or false
diff --git a/xmake/modules/lib/detect/has_ctypes.lua b/xmake/modules/lib/detect/has_ctypes.lua
index 982c06477..9f1e5a57e 100644
--- a/xmake/modules/lib/detect/has_ctypes.lua
+++ b/xmake/modules/lib/detect/has_ctypes.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxsnippets")
--
-- @param types the types
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], includes = .., configs = {defines = .., ..}}
--
-- @return true or false
diff --git a/xmake/modules/lib/detect/has_cxxfuncs.lua b/xmake/modules/lib/detect/has_cxxfuncs.lua
index 6a545267a..e125d6151 100644
--- a/xmake/modules/lib/detect/has_cxxfuncs.lua
+++ b/xmake/modules/lib/detect/has_cxxfuncs.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxxsnippets")
--
-- @param funcs the funcs
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], includes = "", configs = {linkdirs = .., links = .., defines = .., ..}}
--
-- funcs:
diff --git a/xmake/modules/lib/detect/has_cxxincludes.lua b/xmake/modules/lib/detect/has_cxxincludes.lua
index 01f52879c..9941331dc 100644
--- a/xmake/modules/lib/detect/has_cxxincludes.lua
+++ b/xmake/modules/lib/detect/has_cxxincludes.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxsnippets")
--
-- @param includes the includes
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], configs = {defines = "..", .. }}
--
-- @return true or false
diff --git a/xmake/modules/lib/detect/has_cxxtypes.lua b/xmake/modules/lib/detect/has_cxxtypes.lua
index de350f2e8..9db374260 100644
--- a/xmake/modules/lib/detect/has_cxxtypes.lua
+++ b/xmake/modules/lib/detect/has_cxxtypes.lua
@@ -25,7 +25,7 @@ import("lib.detect.check_cxsnippets")
--
-- @param types the types
-- @param opt the argument options
--- .e.g
+-- e.g.
-- { verbose = false, target = [target|option], includes = .., configs = {defines = .., ..}}
--
-- @return true or false
diff --git a/xmake/modules/lib/detect/has_features.lua b/xmake/modules/lib/detect/has_features.lua
index 1bcd7cc9a..d8fc8e051 100644
--- a/xmake/modules/lib/detect/has_features.lua
+++ b/xmake/modules/lib/detect/has_features.lua
@@ -26,7 +26,7 @@ import("lib.detect.features", {alias = "get_features"})
--
-- @param name the tool name
-- @param features the features
--- @param opt the argument options, .e.g {verbose = false, flags = {}, program = ""}}
+-- @param opt the argument options, e.g. {verbose = false, flags = {}, program = ""}}
--
-- @return the supported features or nil
--
diff --git a/xmake/modules/lib/detect/has_flags.lua b/xmake/modules/lib/detect/has_flags.lua
index bebe836d2..bce47582b 100644
--- a/xmake/modules/lib/detect/has_flags.lua
+++ b/xmake/modules/lib/detect/has_flags.lua
@@ -28,7 +28,7 @@ import("lib.detect.find_tool")
--
-- @param name the tool name
-- @param flags the flags
--- @param opt the argument options, .e.g { verbose = false, program = "", sysflags = {}, flagkind = "cxflag", toolkind = "[cc|cxx|ld|ar|sh|gc|rc|dc|mm|mxx]", flagskey = "custom key" }
+-- @param opt the argument options, e.g. { verbose = false, program = "", sysflags = {}, flagkind = "cxflag", toolkind = "[cc|cxx|ld|ar|sh|gc|rc|dc|mm|mxx]", flagskey = "custom key" }
--
-- @return true or false
--
@@ -64,7 +64,7 @@ function main(name, flags, opt)
-- get tool architecture
--
- -- some tools select arch by path environment, not be flags, .e.g cl.exe of msvc)
+ -- some tools select arch by path environment, not be flags, e.g. cl.exe of msvc)
-- so, it will affect the cache result
--
local arch = config.get("arch") or os.arch()
@@ -72,7 +72,7 @@ function main(name, flags, opt)
-- init cache key
local key = plat .. "_" .. arch .. "_" .. tool.program .. "_" .. (tool.version or "") .. "_" .. (opt.toolkind or "") .. "_" .. (opt.flagkind or "") .. "_" .. table.concat(opt.sysflags, " ") .. "_" .. opt.flagskey
- -- @note avoid detect the same program in the same time if running in the coroutine (.e.g ccache)
+ -- @note avoid detect the same program in the same time if running in the coroutine (e.g. ccache)
local coroutine_running = coroutine.running()
if coroutine_running then
while _g._checking ~= nil and _g._checking == key do
@@ -92,7 +92,7 @@ function main(name, flags, opt)
-- generate all checked flags
local checkflags = table.join(flags, opt.sysflags)
- -- split flag group, .e.g "-I /xxx" => {"-I", "/xxx"}
+ -- split flag group, e.g. "-I /xxx" => {"-I", "/xxx"}
local results = {}
for _, flag in ipairs(checkflags) do
flag = flag:trim()