diff options
| author | TitanSnow <[email protected]> | 2017-05-08 13:58:51 +0800 |
|---|---|---|
| committer | TitanSnow <[email protected]> | 2017-05-08 13:58:51 +0800 |
| commit | c1bccef85b8a73b8a324373764006086ce82b58c (patch) | |
| tree | 58472afc02cfb0c8ba28c80c05ae9f5e3f38b960 | |
| parent | 0e82b0084f3abbcbabc376b6681bba08cf47074a (diff) | |
build_configuration -> versioninfo
| -rw-r--r-- | core/src/xmake/machine.c | 4 | ||||
| -rw-r--r-- | core/src/xmake/makefile | 2 | ||||
| -rw-r--r-- | core/src/xmake/os/versioninfo.c (renamed from core/src/xmake/os/build_configuration.c) | 8 | ||||
| -rw-r--r-- | xmake/core/sandbox/modules/os.lua | 6 | ||||
| -rw-r--r-- | xmake/plugins/lua/scripts/build_configuration.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/lua/scripts/versioninfo.lua | 3 |
6 files changed, 13 insertions, 14 deletions
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c index 09ed217f0..b0e86fd00 100644 --- a/core/src/xmake/machine.c +++ b/core/src/xmake/machine.c @@ -80,7 +80,7 @@ tb_int_t xm_os_getenv(lua_State* lua); tb_int_t xm_os_emptydir(lua_State* lua); tb_int_t xm_os_strerror(lua_State* lua); tb_int_t xm_os_getwinsize(lua_State* lua); -tb_int_t xm_os_build_configuration(lua_State* lua); +tb_int_t xm_os_versioninfo(lua_State* lua); // the path functions tb_int_t xm_path_relative(lua_State* lua); @@ -132,7 +132,7 @@ static luaL_Reg const g_os_functions[] = , { "emptydir", xm_os_emptydir } , { "strerror", xm_os_strerror } , { "getwinsize", xm_os_getwinsize} -, { "build_configuration", xm_os_build_configuration} +, { "versioninfo", xm_os_versioninfo} , { tb_null, tb_null } }; diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile index b3b90f965..0d41f4439 100644 --- a/core/src/xmake/makefile +++ b/core/src/xmake/makefile @@ -36,7 +36,7 @@ xmake_C_FILES += \ os/emptydir \ os/strerror \ os/getwinsize \ - os/build_configuration \ + os/versioninfo \ path/relative \ path/absolute \ path/translate \ diff --git a/core/src/xmake/os/build_configuration.c b/core/src/xmake/os/versioninfo.c index 55dc837c4..9cb80ddae 100644 --- a/core/src/xmake/os/build_configuration.c +++ b/core/src/xmake/os/versioninfo.c @@ -19,14 +19,14 @@ * Copyright (C) 2015 - 2017, TBOOX Open Source Group. * * @author TitanSnow - * @file build_configuration.c + * @file versioninfo.c * */ /* ////////////////////////////////////////////////////////////////////////////////////// * trace */ -#define TB_TRACE_MODULE_NAME "build_configuration" +#define TB_TRACE_MODULE_NAME "versioninfo" #define TB_TRACE_MODULE_DEBUG (0) /* ////////////////////////////////////////////////////////////////////////////////////// @@ -38,8 +38,8 @@ * implementation */ -// get build_configuration -tb_int_t xm_os_build_configuration(lua_State* lua) +// get versioninfo +tb_int_t xm_os_versioninfo(lua_State* lua) { // features const char* features_table[] = { diff --git a/xmake/core/sandbox/modules/os.lua b/xmake/core/sandbox/modules/os.lua index e374143fa..b2a41aa31 100644 --- a/xmake/core/sandbox/modules/os.lua +++ b/xmake/core/sandbox/modules/os.lua @@ -514,9 +514,9 @@ function sandbox_os.sudol(runner, luafile, luaargv) sandbox_os.sudov(runner, path.join(sandbox_os.programdir(), "xmake"), table.join(argv, luafile, luaargv)) end --- get build_configuration -function sandbox_os.build_configuration() - return os.build_configuration() +-- get versioninfo +function sandbox_os.versioninfo() + return os.versioninfo() end -- return module diff --git a/xmake/plugins/lua/scripts/build_configuration.lua b/xmake/plugins/lua/scripts/build_configuration.lua deleted file mode 100644 index ec040f405..000000000 --- a/xmake/plugins/lua/scripts/build_configuration.lua +++ /dev/null @@ -1,4 +0,0 @@ -function main() - table.dump(os.build_configuration()) -end -return main diff --git a/xmake/plugins/lua/scripts/versioninfo.lua b/xmake/plugins/lua/scripts/versioninfo.lua new file mode 100644 index 000000000..c6d01667b --- /dev/null +++ b/xmake/plugins/lua/scripts/versioninfo.lua @@ -0,0 +1,3 @@ +function main() + table.dump(os.versioninfo()) +end |
