summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-01-28 20:51:28 +0800
committerruki <[email protected]>2016-02-15 19:10:26 +0800
commit95c4c4f28d8ae3ff135e1e5ea568165987fe472e (patch)
tree754d55462933868abf35346303d0d4747a1e1ece
parent80a87ab432cbe72ab772f02d13daa75bc1010085 (diff)
remove some modules
-rw-r--r--xmake/core/base/interpreter.lua1
-rw-r--r--xmake/core/base/sandbox.lua6
-rw-r--r--xmake/core/module/path.lua25
-rw-r--r--xmake/core/module/string.lua24
-rw-r--r--xmake/core/module/utils.lua24
5 files changed, 4 insertions, 76 deletions
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 855480ebd..eae94ee9c 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -444,6 +444,7 @@ function interpreter.init()
interp:api_register("add_subfiles", interpreter.api_builtin_add_subfiles)
-- register the builtin interfaces for lua
+ interp:api_register_builtin("print", print)
interp:api_register_builtin("pairs", pairs)
interp:api_register_builtin("ipairs", ipairs)
diff --git a/xmake/core/base/sandbox.lua b/xmake/core/base/sandbox.lua
index 96057aca8..06347cffe 100644
--- a/xmake/core/base/sandbox.lua
+++ b/xmake/core/base/sandbox.lua
@@ -98,12 +98,12 @@ function sandbox.init()
-- register the builtin interfaces for lua
sbox:api_register_builtin("print", print)
--- sbox:api_register_builtin("pairs", pairs)
--- sbox:api_register_builtin("ipairs", ipairs)
+ sbox:api_register_builtin("pairs", pairs)
+ sbox:api_register_builtin("ipairs", ipairs)
-- register the builtin modules for lua
sbox:api_register_builtin("path", path)
--- sbox:api_register_builtin("table", table)
+ sbox:api_register_builtin("table", table)
sbox:api_register_builtin("string", string)
-- ok?
diff --git a/xmake/core/module/path.lua b/xmake/core/module/path.lua
deleted file mode 100644
index 9de905667..000000000
--- a/xmake/core/module/path.lua
+++ /dev/null
@@ -1,25 +0,0 @@
---!The Automatic Cross-platform Build Tool
---
--- XMake is free software; you can redistribute it and/or modify
--- it under the terms of the GNU Lesser General Public License as published by
--- the Free Software Foundation; either version 2.1 of the License, or
--- (at your option) any later version.
---
--- XMake is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU Lesser General Public License for more details.
---
--- You should have received a copy of the GNU Lesser General Public License
--- along with XMake;
--- If not, see <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
---
--- Copyright (C) 2009 - 2015, ruki All rights reserved.
---
--- @author ruki
--- @file path.lua
---
-
--- return module: path
-return require("base/path")
-
diff --git a/xmake/core/module/string.lua b/xmake/core/module/string.lua
deleted file mode 100644
index 60d3408cf..000000000
--- a/xmake/core/module/string.lua
+++ /dev/null
@@ -1,24 +0,0 @@
---!The Automatic Cross-platform Build Tool
---
--- XMake is free software; you can redistribute it and/or modify
--- it under the terms of the GNU Lesser General Public License as published by
--- the Free Software Foundation; either version 2.1 of the License, or
--- (at your option) any later version.
---
--- XMake is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU Lesser General Public License for more details.
---
--- You should have received a copy of the GNU Lesser General Public License
--- along with XMake;
--- If not, see <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
---
--- Copyright (C) 2009 - 2015, ruki All rights reserved.
---
--- @author ruki
--- @file string.lua
---
-
--- return module: string
-return require("base/string")
diff --git a/xmake/core/module/utils.lua b/xmake/core/module/utils.lua
deleted file mode 100644
index ab4d2c96f..000000000
--- a/xmake/core/module/utils.lua
+++ /dev/null
@@ -1,24 +0,0 @@
---!The Automatic Cross-platform Build Tool
---
--- XMake is free software; you can redistribute it and/or modify
--- it under the terms of the GNU Lesser General Public License as published by
--- the Free Software Foundation; either version 2.1 of the License, or
--- (at your option) any later version.
---
--- XMake is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU Lesser General Public License for more details.
---
--- You should have received a copy of the GNU Lesser General Public License
--- along with XMake;
--- If not, see <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
---
--- Copyright (C) 2009 - 2015, ruki All rights reserved.
---
--- @author ruki
--- @file utils.lua
---
-
--- return module: utils
-return require("base/utils")