diff options
| author | ruki <[email protected]> | 2018-09-26 22:36:03 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-09-26 09:36:18 +0800 |
| commit | 4c3e74057614dffacd4047c0bd2c107fe5820cdd (patch) | |
| tree | 2ce61197446eeb88cf951e95349ccb274c7297dd | |
| parent | 24c347caafb4c00c236a36f077a9ef882d446dfd (diff) | |
fix test and package bug
| -rw-r--r-- | tests/test.lua | 2 | ||||
| -rw-r--r-- | xmake/core/package/package.lua | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/tests/test.lua b/tests/test.lua index 15db06902..faa7755e0 100644 --- a/tests/test.lua +++ b/tests/test.lua @@ -23,7 +23,7 @@ end function main(name) -- disable statistics - os.setenv("XMAKE_STATS", false) + os.setenv("XMAKE_STATS", "false") -- run the given test if name then diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 1940780f9..939d58028 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -60,11 +60,8 @@ end -- get the package configure function _instance:get(name) - -- the info - local info = self._INFO - - -- get if from info first - local value = info[name] + -- get it from info first + local value = self._INFO[name] if value ~= nil then return value end @@ -228,18 +225,18 @@ function _instance:prefixfile() return path.join(self:prefixdir(".info"), self:name() .. "-" .. (self:version_str() or "") .. ".txt") end --- get variables -function _instance:get(name) +-- get prefix variables +function _instance:getvar(name) return self:prefixinfo()[name] end --- set variables -function _instance:set(name, ...) +-- set prefix variables +function _instance:setvar(name, ...) self:prefixinfo()[name] = {...} end --- add variables -function _instance:add(name, ...) +-- add prefix variables +function _instance:addvar(name, ...) self:prefixinfo()[name] = table.join(self:prefixinfo()[name] or {}, ...) end |