remove versioninfo

8 files changed, 4 insertions, 311 deletions

diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index cdff14964..02334ba9b 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -80,7 +80,6 @@ tb_int_t xm_os_filesize(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_versioninfo(lua_State* lua);
 #ifndef TB_CONFIG_OS_WINDOWS
 tb_int_t xm_os_uid(lua_State* lua);
 tb_int_t xm_os_gid(lua_State* lua);
@@ -173,7 +172,6 @@ static luaL_Reg const g_os_functions[] =
 ,   { "strerror",       xm_os_strerror  }
 ,   { "filesize",       xm_os_filesize  }
 ,   { "getwinsize",     xm_os_getwinsize}
-,   { "versioninfo",    xm_os_versioninfo}
 #ifndef TB_CONFIG_OS_WINDOWS
 ,   { "uid",            xm_os_uid       }
 ,   { "gid",            xm_os_gid       }
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index edee2f843..fb6c1b76d 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -40,7 +40,6 @@ xmake_C_FILES 			+= \
 						os/strerror \
 						os/filesize \
 						os/getwinsize \
-						os/versioninfo \
 						os/uid \
 						os/gid \
 						os/getown \
diff --git a/core/src/xmake/os/versioninfo.c b/core/src/xmake/os/versioninfo.c
deleted file mode 100644
index 252d2fe37..000000000
--- a/core/src/xmake/os/versioninfo.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*!A cross-platform build utility based on Lua
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright (C) 2015 - 2019, TBOOX Open Source Group.
- *
- * @author      TitanSnow
- * @file        versioninfo.c
- *
- */
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * trace
- */
-#define TB_TRACE_MODULE_NAME                "versioninfo"
-#define TB_TRACE_MODULE_DEBUG               (0)
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * includes
- */
-#include "prefix.h"
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * private implementation
- */
-
-static tb_void_t xm_os_insert_set(lua_State* lua, tb_char_t const** p)
-{
-    for (; *p; ++p)
-    {
-        lua_pushstring(lua, *p);
-        lua_pushboolean(lua, tb_true);
-        lua_settable(lua, -3);
-    }
-}
-
-/* //////////////////////////////////////////////////////////////////////////////////////
- * implementation
- */
-
-// get versioninfo
-tb_int_t xm_os_versioninfo(lua_State* lua)
-{
-    // features
-    static tb_char_t const* features_table[] = 
-    {
-#ifdef XM_CONFIG_API_HAVE_READLINE
-        "readline",
-#endif
-        tb_null
-    };
-
-    // configuration table
-    lua_newtable(lua);
-    lua_pushstring(lua, "features");
-
-    // table for features
-    lua_newtable(lua);
-
-    // insert
-    xm_os_insert_set(lua, features_table);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    // table for version
-    lua_pushstring(lua, "version");
-    lua_newtable(lua);
-    // major
-    lua_pushstring(lua, "major");
-    lua_pushinteger(lua, XM_VERSION_MAJOR);
-    lua_settable(lua, -3);
-    // minor
-    lua_pushstring(lua, "minor");
-    lua_pushinteger(lua, XM_VERSION_MINOR);
-    lua_settable(lua, -3);
-    // alter
-    lua_pushstring(lua, "alter");
-    lua_pushinteger(lua, XM_VERSION_ALTER);
-    lua_settable(lua, -3);
-    // build
-    lua_pushstring(lua, "build");
-    lua_pushnumber(lua, XM_VERSION_BUILD);
-    lua_settable(lua, -3);
-    // build string
-    lua_pushstring(lua, "build_string");
-    lua_pushstring(lua, XM_VERSION_BUILD_STRING);
-    lua_settable(lua, -3);
-    // version string
-    lua_pushstring(lua, "version_string");
-    lua_pushstring(lua, XM_VERSION_STRING);
-    lua_settable(lua, -3);
-    // short version string
-    lua_pushstring(lua, "short_version_string");
-    lua_pushstring(lua, XM_VERSION_SHORT_STRING);
-    lua_settable(lua, -3);
-
-    // table for tbox version
-    lua_pushstring(lua, "tbox");
-    lua_newtable(lua);
-    // major
-    lua_pushstring(lua, "major");
-    lua_pushinteger(lua, TB_VERSION_MAJOR);
-    lua_settable(lua, -3);
-    // minor
-    lua_pushstring(lua, "minor");
-    lua_pushinteger(lua, TB_VERSION_MINOR);
-    lua_settable(lua, -3);
-    // alter
-    lua_pushstring(lua, "alter");
-    lua_pushinteger(lua, TB_VERSION_ALTER);
-    lua_settable(lua, -3);
-    // build
-    lua_pushstring(lua, "build");
-    lua_pushnumber(lua, TB_VERSION_BUILD);
-    lua_settable(lua, -3);
-    // build string
-    lua_pushstring(lua, "build_string");
-    lua_pushstring(lua, TB_VERSION_BUILD_STRING);
-    lua_settable(lua, -3);
-    // version string
-    lua_pushstring(lua, "version_string");
-    lua_pushstring(lua, TB_VERSION_STRING);
-    lua_settable(lua, -3);
-    // short version string
-    lua_pushstring(lua, "short_version_string");
-    lua_pushstring(lua, TB_VERSION_SHORT_STRING);
-    lua_settable(lua, -3);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    // table for lua version
-    lua_pushstring(lua, "lua");
-    lua_newtable(lua);
-
-    // version
-    lua_pushstring(lua, "version");
-    lua_pushstring(lua, LUA_RELEASE);
-    lua_settable(lua, -3);
-
-    // version num
-    lua_pushstring(lua, "version_num");
-    lua_pushinteger(lua, LUA_VERSION_NUM);
-    lua_settable(lua, -3);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    // table for luajit version
-    lua_pushstring(lua, "luajit");
-    lua_newtable(lua);
-
-    // version
-    lua_pushstring(lua, "version");
-    lua_pushstring(lua, LUAJIT_VERSION);
-    lua_settable(lua, -3);
-
-    // version num
-    lua_pushstring(lua, "version_num");
-    lua_pushinteger(lua, LUAJIT_VERSION_NUM);
-    lua_settable(lua, -3);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    // mode table
-    static tb_char_t const* mode_table[] = 
-    {
-#ifdef __xm_small__
-        "small",
-#endif
-#ifdef __xm_debug__
-        "debug",
-#endif
-        tb_null
-    };
-
-    // table for mode
-    lua_pushstring(lua, "modes");
-    lua_newtable(lua);
-
-    // insert
-    xm_os_insert_set(lua, mode_table);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    // packages table
-    tb_char_t const* packages_table[] = 
-    {
-#ifdef XM_CONFIG_PACKAGE_HAVE_TBOX
-        "tbox",
-#endif
-#ifdef XM_CONFIG_PACKAGE_HAVE_LUAJIT
-        "luajit",
-#endif
-#ifdef XM_CONFIG_PACKAGE_HAVE_BASE
-        "base",
-#endif
-        tb_null
-    };
-
-    // table for packages
-    lua_pushstring(lua, "packages");
-    lua_newtable(lua);
-
-    // insert
-    xm_os_insert_set(lua, packages_table);
-
-    // set back to table
-    lua_settable(lua, -3);
-
-    lua_pushstring(lua, "host");
-    // init host
-#if defined(TB_CONFIG_OS_WINDOWS)
-    lua_pushstring(lua, "windows");
-#elif defined(TB_CONFIG_OS_MACOSX)
-    lua_pushstring(lua, "macosx");
-#elif defined(TB_CONFIG_OS_LINUX)
-    lua_pushstring(lua, "linux");
-#elif defined(TB_CONFIG_OS_IOS)
-    lua_pushstring(lua, "ios");
-#elif defined(TB_CONFIG_OS_ANDROID)
-    lua_pushstring(lua, "android");
-#elif defined(TB_CONFIG_OS_LIKE_UNIX)
-    lua_pushstring(lua, "unix");
-#else
-    lua_pushstring(lua, "unknown");
-#endif
-    lua_settable(lua, -3);
-
-    lua_pushstring(lua, "arch");
-    // init architecture
-#if defined(TB_ARCH_x86)
-    lua_pushstring(lua, "i386");
-#elif defined(TB_ARCH_x64)
-    lua_pushstring(lua, "x86_64");
-#else
-    lua_pushstring(lua, TB_ARCH_STRING);
-#endif
-    lua_settable(lua, -3);
-
-    lua_pushstring(lua, "nuldev");
-    // init redirect to null
-#if defined(TB_CONFIG_OS_WINDOWS)
-    lua_pushstring(lua, "nul");
-#else
-    lua_pushstring(lua, "/dev/null");
-#endif
-    lua_settable(lua, -3);
-
-    // ok
-    return 1;
-}
diff --git a/xmake/actions/build/statistics.lua b/xmake/actions/build/statistics.lua
index 7a04ed27f..804092763 100644
--- a/xmake/actions/build/statistics.lua
+++ b/xmake/actions/build/statistics.lua
@@ -123,8 +123,8 @@ function main()
     local releasefile = outputdir .. ".release"
     if not os.isfile(releasefile) then
         import("net.http.download")
-        local version = os.versioninfo().version
-        download(format("https://github.com/xmake-io/xmake-stats/releases/download/v%d.%d.%d/%s", version.major, version.minor, version.alter, os.host()), releasefile)
+        local xmakever = xmake.version()
+        download(format("https://github.com/xmake-io/xmake-stats/releases/download/v%d.%d.%d/%s", xmakever:major(), xmakever:minor(), xmakever:patch(), os.host()), releasefile)
         print("post to releases ok!")
     end
 
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 891fd4227..8b9e9dbb5 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -37,7 +37,6 @@ os._rmdir       = os._rmdir or os.rmdir
 os._tmpdir      = os._tmpdir or os.tmpdir
 os._setenv      = os._setenv or os.setenv
 os._readlink    = os._readlink or os.readlink
-os._versioninfo = os._versioninfo or os.versioninfo
 
 -- copy single file or directory 
 function os._cp(src, dst)
@@ -978,11 +977,5 @@ function os.projectfile()
     return xmake._PROJECT_FILE
 end
 
--- get version info
-function os.versioninfo()
-    os._VERSIONINFO = os._VERSIONINFO or os._versioninfo()
-    return os._VERSIONINFO
-end
-
 -- return module
 return os
diff --git a/xmake/core/sandbox/modules/import/core/sandbox/sandbox.lua b/xmake/core/sandbox/modules/import/core/sandbox/sandbox.lua
index 331dbd1de..6bb1b715d 100644
--- a/xmake/core/sandbox/modules/import/core/sandbox/sandbox.lua
+++ b/xmake/core/sandbox/modules/import/core/sandbox/sandbox.lua
@@ -43,8 +43,7 @@ function sandbox_core_sandbox.interactive()
 
     -- load repl history
     local replhistory = nil
-    local enable_readline = os.versioninfo().features.readline
-    if enable_readline then
+    if readline then
 
         -- clear history
         readline.clear_history()
@@ -60,7 +59,7 @@ function sandbox_core_sandbox.interactive()
     sandbox.interactive(instance._PUBLIC) 
 
     -- save repl history if readline is enabled
-    if enable_readline then
+    if readline then
 
         -- save to history
         local entries = readline.history_list()
diff --git a/xmake/core/sandbox/modules/os.lua b/xmake/core/sandbox/modules/os.lua
index 342516c01..2634f3a10 100644
--- a/xmake/core/sandbox/modules/os.lua
+++ b/xmake/core/sandbox/modules/os.lua
@@ -58,7 +58,6 @@ sandbox_os.programdir   = os.programdir
 sandbox_os.programfile  = os.programfile
 sandbox_os.projectdir   = os.projectdir
 sandbox_os.projectfile  = os.projectfile
-sandbox_os.versioninfo  = os.versioninfo
 sandbox_os.getwinsize   = os.getwinsize
 sandbox_os.user_agent   = os.user_agent
 
diff --git a/xmake/plugins/lua/scripts/versioninfo.lua b/xmake/plugins/lua/scripts/versioninfo.lua
deleted file mode 100644
index 9eec627a9..000000000
--- a/xmake/plugins/lua/scripts/versioninfo.lua
+++ /dev/null
@@ -1,27 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- 
--- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
---
--- @author      TitanSnow
--- @file        versioninfo.lua
---
-
--- dump version info
---
--- $ xmake lua versionversion
---
-function main()
-    table.dump(os.versioninfo())
-end