From e7fd0a5c178956eb4801de3780f2bc3c0e7a3e1e Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 21 Jun 2017 18:53:20 +0800 Subject: move tools dir to core.tools and improve tool module --- xmake/core/tool/extractor.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'xmake/core/tool/extractor.lua') diff --git a/xmake/core/tool/extractor.lua b/xmake/core/tool/extractor.lua index 1149e31aa..480005c68 100644 --- a/xmake/core/tool/extractor.lua +++ b/xmake/core/tool/extractor.lua @@ -38,8 +38,6 @@ local tool = require("tool/tool") -- get the current tool function extractor:_tool() - - -- get it return self._TOOL end @@ -72,16 +70,12 @@ end -- get properties of the tool function extractor:get(name) - - -- get it - return self:_tool().get(name) + return self:_tool():get(name) end -- extract the library file function extractor:extract(libraryfile, objectdir) - - -- extract it - return sandbox.load(self:_tool().extract, libraryfile, objectdir) + return sandbox.load(self:_tool().extract, self:_tool(), libraryfile, objectdir) end -- return module -- cgit v1.3.1