diff options
author | V1K1NGbg <victor@ilchev.com> | 2024-08-07 01:01:21 +0300 |
---|---|---|
committer | V1K1NGbg <victor@ilchev.com> | 2024-08-07 01:01:21 +0300 |
commit | 5f741e4edda066043934588dfdfa4198971ec194 (patch) | |
tree | 82d98b4b86f2eb7ea5b282b1a4a6d983f9676d86 | |
parent | e8cc5f928ea4a9a212712926f2e4fd911086ebd5 (diff) | |
download | luarocks-5f741e4edda066043934588dfdfa4198971ec194.tar.gz luarocks-5f741e4edda066043934588dfdfa4198971ec194.tar.bz2 luarocks-5f741e4edda066043934588dfdfa4198971ec194.zip |
deps
-rw-r--r-- | src/luarocks/core/types/rockspec.tl | 7 | ||||
-rw-r--r-- | src/luarocks/deps.lua | 3 | ||||
-rw-r--r-- | src/luarocks/deps.tl | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/luarocks/core/types/rockspec.tl b/src/luarocks/core/types/rockspec.tl index 96464d3c..265d4cb1 100644 --- a/src/luarocks/core/types/rockspec.tl +++ b/src/luarocks/core/types/rockspec.tl | |||
@@ -78,11 +78,6 @@ local record rockspec | |||
78 | queries: {Query} | 78 | queries: {Query} |
79 | end | 79 | end |
80 | 80 | ||
81 | record ExternalDependencies | ||
82 | {string} | ||
83 | queries: {string: Query} | ||
84 | end | ||
85 | |||
86 | record Hooks | 81 | record Hooks |
87 | post_install: string | 82 | post_install: string |
88 | 83 | ||
@@ -106,7 +101,7 @@ local record rockspec | |||
106 | build_dependencies: Dependencies | 101 | build_dependencies: Dependencies |
107 | test_dependencies: Dependencies | 102 | test_dependencies: Dependencies |
108 | supported_platforms: {string} | 103 | supported_platforms: {string} |
109 | external_dependencies: ExternalDependencies | 104 | external_dependencies: {string: {string: string}} |
110 | variables: Variables | 105 | variables: Variables |
111 | hooks: Hooks | 106 | hooks: Hooks |
112 | test: Test | 107 | test: Test |
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index 3350e439..3e2ff522 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -55,7 +55,6 @@ local deplocks = require("luarocks.deplocks") | |||
55 | 55 | ||
56 | 56 | ||
57 | 57 | ||
58 | |||
59 | local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set) | 58 | local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set) |
60 | 59 | ||
61 | return function(dep) | 60 | return function(dep) |
@@ -649,7 +648,7 @@ function deps.check_external_deps(rockspec, mode) | |||
649 | return true | 648 | return true |
650 | end | 649 | end |
651 | 650 | ||
652 | for name, ext_files in util.sortedpairs(rockspec.external_dependencies.queries) do | 651 | for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do |
653 | local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode) | 652 | local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode) |
654 | if not ok then | 653 | if not ok then |
655 | local lines = { "Could not find " .. err_testfile .. " file for " .. name } | 654 | local lines = { "Could not find " .. err_testfile .. " file for " .. name } |
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl index 2a9b1f0a..53dac145 100644 --- a/src/luarocks/deps.tl +++ b/src/luarocks/deps.tl | |||
@@ -17,7 +17,6 @@ local type r = require("luarocks.core.types.rockspec") | |||
17 | local type Rockspec = r.Rockspec | 17 | local type Rockspec = r.Rockspec |
18 | local type Build = r.Build | 18 | local type Build = r.Build |
19 | local type Dependencies = r.Dependencies | 19 | local type Dependencies = r.Dependencies |
20 | local type ExternalDependencies = r.ExternalDependencies | ||
21 | local type Variables = r.Variables | 20 | local type Variables = r.Variables |
22 | 21 | ||
23 | local type t = require("luarocks.core.types.tree") | 22 | local type t = require("luarocks.core.types.tree") |
@@ -643,13 +642,13 @@ end | |||
643 | function deps.check_external_deps(rockspec: Rockspec, mode: string): boolean, string, string | 642 | function deps.check_external_deps(rockspec: Rockspec, mode: string): boolean, string, string |
644 | 643 | ||
645 | if not rockspec.external_dependencies then | 644 | if not rockspec.external_dependencies then |
646 | rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build) as ExternalDependencies | 645 | rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build) as {string: {string: string}} |
647 | end | 646 | end |
648 | if not rockspec.external_dependencies then | 647 | if not rockspec.external_dependencies then |
649 | return true | 648 | return true |
650 | end | 649 | end |
651 | 650 | ||
652 | for name, ext_files in util.sortedpairs(rockspec.external_dependencies.queries) do | 651 | for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do |
653 | local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files as {string : string | {string}}, rockspec.variables as {string: string}, mode) | 652 | local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files as {string : string | {string}}, rockspec.variables as {string: string}, mode) |
654 | if not ok then | 653 | if not ok then |
655 | local lines = {"Could not find "..err_testfile.." file for "..name} | 654 | local lines = {"Could not find "..err_testfile.." file for "..name} |