summaryrefslogtreecommitdiff
path: root/xmake/modules/private/action/require/impl/lock_packages.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2021-08-17 23:58:31 +0800
committerruki <[email protected]>2021-08-17 23:58:31 +0800
commit7f8f4ee2e1640635792ab8a57f3b53f04422205c (patch)
tree51ad1d7d41f120073fcaeddaf9fb8f8ba6404f1d /xmake/modules/private/action/require/impl/lock_packages.lua
parent4e14e4eca4c713eb0fd1d0f52c2f7e6f411b2f92 (diff)
add require key
Diffstat (limited to 'xmake/modules/private/action/require/impl/lock_packages.lua')
-rw-r--r--xmake/modules/private/action/require/impl/lock_packages.lua12
1 files changed, 5 insertions, 7 deletions
diff --git a/xmake/modules/private/action/require/impl/lock_packages.lua b/xmake/modules/private/action/require/impl/lock_packages.lua
index f41e3122f..e624f8d1a 100644
--- a/xmake/modules/private/action/require/impl/lock_packages.lua
+++ b/xmake/modules/private/action/require/impl/lock_packages.lua
@@ -24,12 +24,10 @@ import("devel.git")
import("private.action.require.impl.utils.filter")
import("private.action.require.impl.utils.requirekey")
--- get package key
-function _get_packagekey(instance)
+-- get locked package key
+function _get_packagelock_key(instance)
local requireinfo = instance:requireinfo()
local requirestr = requireinfo.originstr
- local plat = instance:plat()
- local arch = instance:arch()
local key = requirekey(requireinfo, {plat = instance:plat(), arch = instance:arch()})
return string.format("%s#%s", requirestr, key)
end
@@ -66,7 +64,7 @@ function _lock_package(instance)
end
for _, dep in ipairs(instance:plaindeps()) do
result.deps = result.deps or {}
- table.insert(result.deps, _get_packagekey(dep))
+ table.insert(result.deps, _get_packagelock_key(dep))
end
return result
end
@@ -76,8 +74,8 @@ function main(packages)
if project.policy("package.requires_lock") then
local results = {}
for _, instance in ipairs(packages) do
- local packagekey = _get_packagekey(instance)
- results[packagekey] = _lock_package(instance)
+ local packagelock_key = _get_packagelock_key(instance)
+ results[packagelock_key] = _lock_package(instance)
end
io.writefile(project.requireslock(), string.serialize(results, {orderkeys = true}))
end