diff options
| author | ruki <[email protected]> | 2018-08-11 00:38:58 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-08-10 21:53:49 +0800 |
| commit | be6c4d881079de40454f7252fd78c54723cf2f13 (patch) | |
| tree | 296b792b70ff452320e6d1416f09686ff194d64a | |
| parent | 155587617e5e21a569911a4d93e7b5e39e44e0f5 (diff) | |
rename has_configs to has_config
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | xmake/core/project/config.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/deprecated/project.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/project.lua | 4 | ||||
| -rw-r--r-- | xmake/core/sandbox/modules/has_config.lua (renamed from xmake/core/sandbox/modules/has_configs.lua) | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 69b8322e3..01651d54e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### New features * Support fasm assembler -* Add `has_configs` and `is_config` apis +* Add `has_config` and `is_config` apis ### Changes @@ -475,7 +475,7 @@ ### 新特性 * 新增fasm汇编器支持 -* 添加`has_configs`和`is_config`接口去快速判断option和配置值 +* 添加`has_config`和`is_config`接口去快速判断option和配置值 ### 改进 diff --git a/xmake/core/project/config.lua b/xmake/core/project/config.lua index 48f6bc9c1..283c0a060 100644 --- a/xmake/core/project/config.lua +++ b/xmake/core/project/config.lua @@ -267,7 +267,7 @@ function config.is_value(name, ...) end end --- some configs are enabled or exists? +-- has the given configs? function config.has(...) for _, name in ipairs(table.join(...)) do if name and type(name) == "string" and config.get(name) then diff --git a/xmake/core/project/deprecated/project.lua b/xmake/core/project/deprecated/project.lua index e1528fdab..08a27d0c5 100644 --- a/xmake/core/project/deprecated/project.lua +++ b/xmake/core/project/deprecated/project.lua @@ -135,7 +135,7 @@ function deprecated_project._api_is_option(interp, ...) end -- deprecated - deprecated.add("has_configs(\"%s\")", "is_option(\"%s\")", values) + deprecated.add("has_config(\"%s\")", "is_option(\"%s\")", values) -- done return config.has(...) diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua index 8fa47ab38..418a35086 100644 --- a/xmake/core/project/project.lua +++ b/xmake/core/project/project.lua @@ -104,7 +104,7 @@ function project._api_is_config(interp, name, ...) end -- some configs are enabled? -function project._api_has_configs(interp, ...) +function project._api_has_config(interp, ...) return config.has(...) end @@ -200,7 +200,7 @@ function project.interpreter() , {"is_plat", project._api_is_plat } , {"is_arch", project._api_is_arch } , {"is_config", project._api_is_config } - , {"has_configs", project._api_has_configs } + , {"has_config", project._api_has_config } -- add_xxx , {"add_moduledirs", project._api_add_moduledirs } , {"add_plugindirs", project._api_add_plugindirs } diff --git a/xmake/core/sandbox/modules/has_configs.lua b/xmake/core/sandbox/modules/has_config.lua index 172a258f8..ed19de651 100644 --- a/xmake/core/sandbox/modules/has_configs.lua +++ b/xmake/core/sandbox/modules/has_config.lua @@ -19,7 +19,7 @@ -- Copyright (C) 2015 - 2018, TBOOX Open Source Group. -- -- @author ruki --- @file has_configs.lua +-- @file has_config.lua -- -- return module |
