diff options
| author | ruki <[email protected]> | 2016-03-03 13:36:30 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-03-03 13:36:30 +0800 |
| commit | 5cf23fadbd11d5c6aaf6c69da322f9150d10cf49 (patch) | |
| tree | 5953e689f525681d02cd11cb7a206ac3133c0776 /xmake/core/base/task.lua | |
| parent | af8e19e9b32faeadc816087a8d0b86e13e8f948c (diff) | |
remove global
Diffstat (limited to 'xmake/core/base/task.lua')
| -rw-r--r-- | xmake/core/base/task.lua | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/xmake/core/base/task.lua b/xmake/core/base/task.lua index d58844862..c7eb18f5a 100644 --- a/xmake/core/base/task.lua +++ b/xmake/core/base/task.lua @@ -29,15 +29,13 @@ local table = require("base/table") local utils = require("base/utils") local filter = require("base/filter") local string = require("base/string") -local global = require("base/global") local sandbox = require("base/sandbox") local interpreter = require("base/interpreter") -- the directories of tasks function task._directories() - return { path.join(global.directory(), "plugins") - , path.join(xmake._PROGRAM_DIR, "plugins") + return { path.join(xmake._PROGRAM_DIR, "plugins") , path.join(xmake._PROGRAM_DIR, "actions") } end @@ -81,7 +79,6 @@ function task._interpreter() local maps = { host = xmake._HOST - , globaldir = global.directory() } -- map it @@ -274,14 +271,6 @@ function task.run(name) return false end - -- load global - if not global.load() then - - -- trace - utils.error("load global configure failed!") - return false - end - -- run on_before, on_run, on_after local ok = true local on_scripts = {taskinfo.before, taskinfo.run, taskinfo.after} |
