diff options
Diffstat (limited to 'src/luarocks/deps.lua')
-rw-r--r-- | src/luarocks/deps.lua | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index f6de0db8..7e7b69e6 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -47,7 +47,7 @@ local function prepare_get_versions(deps_mode, rocks_provided, depskey, blacklis | |||
47 | end | 47 | end |
48 | versions, locations = manif.get_versions(dep, deps_mode) | 48 | versions, locations = manif.get_versions(dep, deps_mode) |
49 | end | 49 | end |
50 | 50 | ||
51 | if blacklist and blacklist[dep.name] then | 51 | if blacklist and blacklist[dep.name] then |
52 | local orig_versions = versions | 52 | local orig_versions = versions |
53 | versions = {} | 53 | versions = {} |
@@ -57,9 +57,9 @@ local function prepare_get_versions(deps_mode, rocks_provided, depskey, blacklis | |||
57 | end | 57 | end |
58 | end | 58 | end |
59 | end | 59 | end |
60 | 60 | ||
61 | local lockversion = deplocks.get(depskey, dep.name) | 61 | local lockversion = deplocks.get(depskey, dep.name) |
62 | 62 | ||
63 | return versions, locations, lockversion, provided ~= nil | 63 | return versions, locations, lockversion, provided ~= nil |
64 | end | 64 | end |
65 | end | 65 | end |
@@ -81,9 +81,9 @@ end | |||
81 | local function match_dep(dep, get_versions) | 81 | local function match_dep(dep, get_versions) |
82 | assert(type(dep) == "table") | 82 | assert(type(dep) == "table") |
83 | assert(type(get_versions) == "function") | 83 | assert(type(get_versions) == "function") |
84 | 84 | ||
85 | local versions, locations, lockversion, provided = get_versions(dep) | 85 | local versions, locations, lockversion, provided = get_versions(dep) |
86 | 86 | ||
87 | local latest_version | 87 | local latest_version |
88 | local latest_vstring | 88 | local latest_vstring |
89 | for _, vstring in ipairs(versions) do | 89 | for _, vstring in ipairs(versions) do |
@@ -95,7 +95,7 @@ local function match_dep(dep, get_versions) | |||
95 | end | 95 | end |
96 | end | 96 | end |
97 | end | 97 | end |
98 | 98 | ||
99 | if lockversion and not locations[lockversion] then | 99 | if lockversion and not locations[lockversion] then |
100 | local latest_matching_msg = "" | 100 | local latest_matching_msg = "" |
101 | if latest_vstring and latest_vstring ~= lockversion then | 101 | if latest_vstring and latest_vstring ~= lockversion then |
@@ -104,7 +104,7 @@ local function match_dep(dep, get_versions) | |||
104 | util.printout("Forcing " .. dep.name .. " to pinned version " .. lockversion .. latest_matching_msg) | 104 | util.printout("Forcing " .. dep.name .. " to pinned version " .. lockversion .. latest_matching_msg) |
105 | return nil, nil, queries.new(dep.name, dep.namespace, lockversion) | 105 | return nil, nil, queries.new(dep.name, dep.namespace, lockversion) |
106 | end | 106 | end |
107 | 107 | ||
108 | return latest_vstring, locations[latest_vstring], dep, provided | 108 | return latest_vstring, locations[latest_vstring], dep, provided |
109 | end | 109 | end |
110 | 110 | ||
@@ -113,7 +113,7 @@ local function match_all_deps(dependencies, get_versions) | |||
113 | assert(type(get_versions) == "function") | 113 | assert(type(get_versions) == "function") |
114 | 114 | ||
115 | local matched, missing, no_upgrade = {}, {}, {} | 115 | local matched, missing, no_upgrade = {}, {}, {} |
116 | 116 | ||
117 | for _, dep in ipairs(dependencies) do | 117 | for _, dep in ipairs(dependencies) do |
118 | local found, _, provided | 118 | local found, _, provided |
119 | found, _, dep, provided = match_dep(dep, get_versions) | 119 | found, _, dep, provided = match_dep(dep, get_versions) |
@@ -169,7 +169,7 @@ end | |||
169 | -- @param version string: package version. | 169 | -- @param version string: package version. |
170 | -- @param dependencies table: array of dependencies. | 170 | -- @param dependencies table: array of dependencies. |
171 | -- @param deps_mode string: Which trees to check dependencies for | 171 | -- @param deps_mode string: Which trees to check dependencies for |
172 | -- @param rocks_provided table: A table of auto-dependencies provided | 172 | -- @param rocks_provided table: A table of auto-dependencies provided |
173 | -- by this Lua implementation for the given dependency. | 173 | -- by this Lua implementation for the given dependency. |
174 | -- "one" for the current default tree, "all" for all trees, | 174 | -- "one" for the current default tree, "all" for all trees, |
175 | -- "order" for all trees with priority >= the current default, "none" for no trees. | 175 | -- "order" for all trees with priority >= the current default, "none" for no trees. |
@@ -179,7 +179,7 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode | |||
179 | assert(type(dependencies) == "table") | 179 | assert(type(dependencies) == "table") |
180 | assert(type(deps_mode) == "string") | 180 | assert(type(deps_mode) == "string") |
181 | assert(type(rocks_provided) == "table") | 181 | assert(type(rocks_provided) == "table") |
182 | 182 | ||
183 | if deps_mode == "none" then | 183 | if deps_mode == "none" then |
184 | return | 184 | return |
185 | end | 185 | end |
@@ -270,7 +270,7 @@ local function check_supported_platforms(rockspec) | |||
270 | return nil, "This rockspec for "..rockspec.package.." does not support "..plats.." platforms." | 270 | return nil, "This rockspec for "..rockspec.package.." does not support "..plats.." platforms." |
271 | end | 271 | end |
272 | end | 272 | end |
273 | 273 | ||
274 | return true | 274 | return true |
275 | end | 275 | end |
276 | 276 | ||
@@ -295,7 +295,7 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock | |||
295 | local name = rockspec.name | 295 | local name = rockspec.name |
296 | local version = rockspec.version | 296 | local version = rockspec.version |
297 | local rocks_provided = rockspec.rocks_provided | 297 | local rocks_provided = rockspec.rocks_provided |
298 | 298 | ||
299 | local ok, filename, err = deplocks.load(name, deplock_dir or ".") | 299 | local ok, filename, err = deplocks.load(name, deplock_dir or ".") |
300 | if filename then | 300 | if filename then |
301 | util.printout("Using dependencies pinned in lockfile: " .. filename) | 301 | util.printout("Using dependencies pinned in lockfile: " .. filename) |
@@ -530,7 +530,7 @@ local function check_external_dependency(name, ext_files, vars, mode, cache) | |||
530 | local err_files = {program = {}, header = {}, library = {}} | 530 | local err_files = {program = {}, header = {}, library = {}} |
531 | 531 | ||
532 | local dirs = get_external_deps_dirs(mode) | 532 | local dirs = get_external_deps_dirs(mode) |
533 | 533 | ||
534 | local prefixes | 534 | local prefixes |
535 | if vars[name .. "_DIR"] then | 535 | if vars[name .. "_DIR"] then |
536 | prefixes = { vars[name .. "_DIR"] } | 536 | prefixes = { vars[name .. "_DIR"] } |
@@ -539,7 +539,7 @@ local function check_external_dependency(name, ext_files, vars, mode, cache) | |||
539 | else | 539 | else |
540 | prefixes = cfg.external_deps_dirs | 540 | prefixes = cfg.external_deps_dirs |
541 | end | 541 | end |
542 | 542 | ||
543 | for _, prefix in ipairs(prefixes) do | 543 | for _, prefix in ipairs(prefixes) do |
544 | prefix = resolve_prefix(prefix, dirs) | 544 | prefix = resolve_prefix(prefix, dirs) |
545 | if cfg.is_platform("mingw32") and name == "LUA" then | 545 | if cfg.is_platform("mingw32") and name == "LUA" then |
@@ -556,7 +556,7 @@ local function check_external_dependency(name, ext_files, vars, mode, cache) | |||
556 | return true | 556 | return true |
557 | end | 557 | end |
558 | end | 558 | end |
559 | 559 | ||
560 | return nil, err_dirname, err_testfile, err_files | 560 | return nil, err_dirname, err_testfile, err_files |
561 | end | 561 | end |
562 | 562 | ||
@@ -575,7 +575,7 @@ end | |||
575 | -- nil and an error message if any test failed. | 575 | -- nil and an error message if any test failed. |
576 | function deps.check_external_deps(rockspec, mode) | 576 | function deps.check_external_deps(rockspec, mode) |
577 | assert(rockspec:type() == "rockspec") | 577 | assert(rockspec:type() == "rockspec") |
578 | 578 | ||
579 | if not rockspec.external_dependencies then | 579 | if not rockspec.external_dependencies then |
580 | rockspec.external_dependencies = builtin.autodetect_external_dependencies(rockspec.build) | 580 | rockspec.external_dependencies = builtin.autodetect_external_dependencies(rockspec.build) |
581 | end | 581 | end |
@@ -587,7 +587,7 @@ function deps.check_external_deps(rockspec, mode) | |||
587 | local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode) | 587 | local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode) |
588 | if not ok then | 588 | if not ok then |
589 | local lines = {"Could not find "..err_testfile.." file for "..name} | 589 | local lines = {"Could not find "..err_testfile.." file for "..name} |
590 | 590 | ||
591 | local err_paths = {} | 591 | local err_paths = {} |
592 | for _, err_file in ipairs(err_files[err_testfile]) do | 592 | for _, err_file in ipairs(err_files[err_testfile]) do |
593 | if not err_paths[err_file] then | 593 | if not err_paths[err_file] then |
@@ -595,10 +595,10 @@ function deps.check_external_deps(rockspec, mode) | |||
595 | table.insert(lines, " No file "..err_file) | 595 | table.insert(lines, " No file "..err_file) |
596 | end | 596 | end |
597 | end | 597 | end |
598 | 598 | ||
599 | table.insert(lines, "You may have to install "..name.." in your system and/or pass "..name.."_DIR or "..name.."_"..err_dirname.." to the luarocks command.") | 599 | table.insert(lines, "You may have to install "..name.." in your system and/or pass "..name.."_DIR or "..name.."_"..err_dirname.." to the luarocks command.") |
600 | table.insert(lines, "Example: luarocks install "..rockspec.name.." "..name.."_DIR=/usr/local") | 600 | table.insert(lines, "Example: luarocks install "..rockspec.name.." "..name.."_DIR=/usr/local") |
601 | 601 | ||
602 | return nil, table.concat(lines, "\n"), "dependency" | 602 | return nil, table.concat(lines, "\n"), "dependency" |
603 | end | 603 | end |
604 | end | 604 | end |
@@ -700,7 +700,7 @@ function deps.check_lua_incdir(vars) | |||
700 | if vars.LUA_INCDIR then | 700 | if vars.LUA_INCDIR then |
701 | return lua_h_exists(vars.LUA_INCDIR, cfg.lua_version) | 701 | return lua_h_exists(vars.LUA_INCDIR, cfg.lua_version) |
702 | end | 702 | end |
703 | 703 | ||
704 | if vars.LUA_DIR then | 704 | if vars.LUA_DIR then |
705 | vars.LUA_INCDIR = find_lua_incdir(vars.LUA_DIR, cfg.lua_version, ljv) | 705 | vars.LUA_INCDIR = find_lua_incdir(vars.LUA_DIR, cfg.lua_version, ljv) |
706 | if vars.LUA_INCDIR then | 706 | if vars.LUA_INCDIR then |