From da549a072e8288dd5822a9c6ea747c3250ef17c7 Mon Sep 17 00:00:00 2001 From: V1K1NGbg Date: Tue, 6 Aug 2024 22:27:09 +0300 Subject: rockspec lua gen --- src/luarocks/core/types/rockspec.lua | 12 +----------- src/luarocks/rockspecs.lua | 13 +++++++------ 2 files changed, 8 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/luarocks/core/types/rockspec.lua b/src/luarocks/core/types/rockspec.lua index 222887e9..6acd4b64 100644 --- a/src/luarocks/core/types/rockspec.lua +++ b/src/luarocks/core/types/rockspec.lua @@ -1,17 +1,7 @@ -local rockspec = {Description = {}, Variables = {}, Source = {}, Test = {}, Install = {}, Build = {}, Dependencies = {}, BuildDependencies = {}, ExternalDependencies = {}, TestDependencies = {}, Hooks = {}, Deploy = {}, Rockspec = {}, } - - - - - - - - - - +local rockspec = {Description = {}, Variables = {}, Source = {}, Test = {}, Install = {}, Build = {}, Dependencies = {}, ExternalDependencies = {}, Hooks = {}, Deploy = {}, Rockspec = {}, } diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua index a39c39d9..337de233 100644 --- a/src/luarocks/rockspecs.lua +++ b/src/luarocks/rockspecs.lua @@ -17,6 +17,7 @@ local rock = require("luarocks.core.types.rockspec") + local vendored_build_type_set = { ["builtin"] = true, ["cmake"] = true, @@ -66,7 +67,7 @@ end local function convert_dependencies(dependencies) if not dependencies then - return {} + return true end local qs = {} for i = 1, #dependencies do @@ -76,7 +77,8 @@ local function convert_dependencies(dependencies) end qs[i] = parsed end - return qs + dependencies.queries = qs + return true end @@ -151,18 +153,17 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick) rockspec.rocks_provided = util.get_rocks_provided(rockspec) - local err - rockspec.dependencies.queries, err = convert_dependencies(rockspec.dependencies) + local ok, err = convert_dependencies(rockspec.dependencies) if err then return nil, err end - rockspec.build_dependencies.queries, err = convert_dependencies(rockspec.build_dependencies) + ok, err = convert_dependencies(rockspec.build_dependencies) if err then return nil, err end - rockspec.test_dependencies.queries, err = convert_dependencies(rockspec.test_dependencies) + ok, err = convert_dependencies(rockspec.test_dependencies) if err then return nil, err end -- cgit v1.2.3-55-g6feb