aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV1K1NGbg <victor@ilchev.com>2024-08-06 19:16:22 +0300
committerV1K1NGbg <victor@ilchev.com>2024-08-06 19:16:22 +0300
commit310004d18ce4fe6305511e1a0d5036da99e1a5e4 (patch)
tree6ba0d8a1a823b849a89c9341566f8979b23775aa
parent1531a6f75144d582f22d433c60f8ff5373aad375 (diff)
downloadluarocks-310004d18ce4fe6305511e1a0d5036da99e1a5e4.tar.gz
luarocks-310004d18ce4fe6305511e1a0d5036da99e1a5e4.tar.bz2
luarocks-310004d18ce4fe6305511e1a0d5036da99e1a5e4.zip
deps
-rw-r--r--src/luarocks/deps-original.lua (renamed from src/luarocks/deps-incomplete.lua)426
-rw-r--r--src/luarocks/deps.lua428
-rw-r--r--src/luarocks/deps.tl22
3 files changed, 438 insertions, 438 deletions
diff --git a/src/luarocks/deps-incomplete.lua b/src/luarocks/deps-original.lua
index fe93a900..1a9eefde 100644
--- a/src/luarocks/deps-incomplete.lua
+++ b/src/luarocks/deps-original.lua
@@ -1,8 +1,7 @@
1local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
2 1
2--- High-level dependency related functions.
3local deps = {} 3local deps = {}
4 4
5
6local cfg = require("luarocks.core.cfg") 5local cfg = require("luarocks.core.cfg")
7local manif = require("luarocks.manif") 6local manif = require("luarocks.manif")
8local path = require("luarocks.path") 7local path = require("luarocks.path")
@@ -13,56 +12,34 @@ local vers = require("luarocks.core.vers")
13local queries = require("luarocks.queries") 12local queries = require("luarocks.queries")
14local deplocks = require("luarocks.deplocks") 13local deplocks = require("luarocks.deplocks")
15 14
16 15--- Generate a function that matches dep queries against the manifest,
17 16-- taking into account rocks_provided, the list of versions to skip,
18 17-- and the lockfile.
19 18-- @param deps_mode "one", "none", "all" or "order"
20 19-- @param rocks_provided a one-level table mapping names to versions,
21 20-- listing rocks to consider provided by the VM
22 21-- @param rocks_provided table: A table of auto-provided dependencies.
23 22-- by this Lua implementation for the given dependency.
24 23-- @param depskey key to use when matching the lockfile ("dependencies",
25 24-- "build_dependencies", etc.)
26 25-- @param skip_set a two-level table mapping names to versions to
27 26-- boolean, listing rocks that should not be matched
28 27-- @return function(dep): {string}, {string:string}, string, boolean
29local v = require("luarocks.core.types.version") 28-- * array of matching versions
30 29-- * map of versions to locations
31 30-- * version matched via lockfile if any
32 31-- * true if rock matched via rocks_provided
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set) 32local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set)
33 assert(type(deps_mode) == "string")
34 assert(type(rocks_provided) == "table")
35 assert(type(depskey) == "string")
36 assert(type(skip_set) == "table" or skip_set == nil)
60 37
61 return function(dep) 38 return function(dep)
62 local versions, locations 39 local versions, locations
63 local provided = rocks_provided[dep.name] 40 local provided = rocks_provided[dep.name]
64 if provided then 41 if provided then
65 42 -- Provided rocks have higher priority than manifest's rocks.
66 versions, locations = { provided }, {} 43 versions, locations = { provided }, {}
67 else 44 else
68 if deps_mode == "none" then 45 if deps_mode == "none" then
@@ -86,20 +63,21 @@ local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set
86 end 63 end
87end 64end
88 65
89 66--- Attempt to match a dependency to an installed rock.
90 67-- @param get_versions a getter function obtained via prepare_get_versions
91 68-- @return (string, string, table) or (nil, nil, table):
92 69-- 1. latest installed version of the rock matching the dependency
93 70-- 2. location where the installed version is installed
94 71-- 3. the 'dep' query table
95 72-- 4. true if provided via VM
96 73-- or
97 74-- 1. nil
98 75-- 2. nil
99 76-- 3. either 'dep' or an alternative query to be used
100 77-- 4. false
101local function match_dep(dep, 78local function match_dep(dep, get_versions)
102 get_versions) 79 assert(type(dep) == "table")
80 assert(type(get_versions) == "function")
103 81
104 local versions, locations, lockversion, provided = get_versions(dep) 82 local versions, locations, lockversion, provided = get_versions(dep)
105 83
@@ -127,8 +105,9 @@ local function match_dep(dep,
127 return latest_vstring, locations[latest_vstring], dep, provided 105 return latest_vstring, locations[latest_vstring], dep, provided
128end 106end
129 107
130local function match_all_deps(dependencies, 108local function match_all_deps(dependencies, get_versions)
131 get_versions) 109 assert(type(dependencies) == "table")
110 assert(type(get_versions) == "function")
132 111
133 local matched, missing, no_upgrade = {}, {}, {} 112 local matched, missing, no_upgrade = {}, {}, {}
134 113
@@ -137,7 +116,7 @@ local function match_all_deps(dependencies,
137 found, _, dep, provided = match_dep(dep, get_versions) 116 found, _, dep, provided = match_dep(dep, get_versions)
138 if found then 117 if found then
139 if not provided then 118 if not provided then
140 matched[dep] = { name = dep.name, version = found } 119 matched[dep] = {name = dep.name, version = found}
141 end 120 end
142 else 121 else
143 if dep.constraints[1] and dep.constraints[1].no_upgrade then 122 if dep.constraints[1] and dep.constraints[1].no_upgrade then
@@ -150,41 +129,53 @@ local function match_all_deps(dependencies,
150 return matched, missing, no_upgrade 129 return matched, missing, no_upgrade
151end 130end
152 131
153 132--- Attempt to match dependencies of a rockspec to installed rocks.
154 133-- @param dependencies table: The table of dependencies.
155 134-- @param rocks_provided table: The table of auto-provided dependencies.
156 135-- @param skip_set table or nil: Program versions to not use as valid matches.
157 136-- Table where keys are program names and values are tables where keys
158 137-- are program versions and values are 'true'.
159 138-- @param deps_mode string: Which trees to check dependencies for
160 139-- @return table, table, table: A table where keys are dependencies parsed
161 140-- in table format and values are tables containing fields 'name' and
162 141-- version' representing matches; a table of missing dependencies
163 142-- parsed as tables; and a table of "no-upgrade" missing dependencies
164 143-- (to be used in plugin modules so that a plugin does not force upgrade of
165 144-- its parent application).
166function deps.match_deps(dependencies, rocks_provided, deps_mode, skip_set) 145function deps.match_deps(dependencies, rocks_provided, deps_mode, skip_set)
146 assert(type(dependencies) == "table")
147 assert(type(rocks_provided) == "table")
148 assert(type(skip_set) == "table" or skip_set == nil)
149 assert(type(deps_mode) == "string")
167 150
168 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies", skip_set) 151 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies", skip_set)
169 return match_all_deps(dependencies, get_versions) 152 return match_all_deps(dependencies, get_versions)
170end 153end
171 154
172local function rock_status(dep, get_versions) 155local function rock_status(dep, get_versions)
156 assert(dep:type() == "query")
157 assert(type(get_versions) == "function")
158
173 local installed, _, _, provided = match_dep(dep, get_versions) 159 local installed, _, _, provided = match_dep(dep, get_versions)
174 local installation_type = provided and "provided by VM" or "installed" 160 local installation_type = provided and "provided by VM" or "installed"
175 return installed and installed .. " " .. installation_type .. ": success" or "not installed" 161 return installed and installed.." "..installation_type..": success" or "not installed"
176end 162end
177 163
178 164--- Check depenendencies of a package and report any missing ones.
179 165-- @param name string: package name.
180 166-- @param version string: package version.
181 167-- @param dependencies table: array of dependencies.
182 168-- @param deps_mode string: Which trees to check dependencies for
183 169-- @param rocks_provided table: A table of auto-dependencies provided
184 170-- by this Lua implementation for the given dependency.
185 171-- "one" for the current default tree, "all" for all trees,
186 172-- "order" for all trees with priority >= the current default, "none" for no trees.
187function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided) 173function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided)
174 assert(type(name) == "string")
175 assert(type(version) == "string")
176 assert(type(dependencies) == "table")
177 assert(type(deps_mode) == "string")
178 assert(type(rocks_provided) == "table")
188 179
189 if deps_mode == "none" then 180 if deps_mode == "none" then
190 return 181 return
@@ -209,6 +200,11 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode
209end 200end
210 201
211function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey) 202function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
203 assert(dep:type() == "query")
204 assert(type(deps_mode) == "string" or deps_mode == nil)
205 assert(type(rocks_provided) == "table" or rocks_provided == nil)
206 assert(type(verify) == "boolean" or verify == nil)
207 assert(type(depskey) == "string")
212 208
213 deps_mode = deps_mode or "all" 209 deps_mode = deps_mode or "all"
214 rocks_provided = rocks_provided or {} 210 rocks_provided = rocks_provided or {}
@@ -228,9 +224,9 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
228 224
229 local url, search_err = search.find_suitable_rock(dep) 225 local url, search_err = search.find_suitable_rock(dep)
230 if not url then 226 if not url then
231 return nil, "Could not satisfy dependency " .. tostring(dep) .. ": " .. search_err 227 return nil, "Could not satisfy dependency "..tostring(dep)..": "..search_err
232 end 228 end
233 util.printout("Installing " .. url) 229 util.printout("Installing "..url)
234 local install_args = { 230 local install_args = {
235 rock = url, 231 rock = url,
236 deps_mode = deps_mode, 232 deps_mode = deps_mode,
@@ -239,7 +235,7 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
239 } 235 }
240 local ok, install_err, errcode = install.command(install_args) 236 local ok, install_err, errcode = install.command(install_args)
241 if not ok then 237 if not ok then
242 return nil, "Failed installing dependency: " .. url .. " - " .. install_err, errcode 238 return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
243 end 239 end
244 240
245 found, where = match_dep(dep, get_versions) 241 found, where = match_dep(dep, get_versions)
@@ -250,15 +246,15 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
250end 246end
251 247
252local function check_supported_platforms(rockspec) 248local function check_supported_platforms(rockspec)
253 if rockspec.supported_platforms and next(rockspec.supported_platforms) ~= nil then 249 if rockspec.supported_platforms and next(rockspec.supported_platforms) then
254 local all_negative = true 250 local all_negative = true
255 local supported = false 251 local supported = false
256 for _, plat in ipairs(rockspec.supported_platforms) do 252 for _, plat in pairs(rockspec.supported_platforms) do
257 local neg 253 local neg
258 neg, plat = plat:match("^(!?)(.*)") 254 neg, plat = plat:match("^(!?)(.*)")
259 if neg == "!" then 255 if neg == "!" then
260 if cfg.is_platform(plat) then 256 if cfg.is_platform(plat) then
261 return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plat .. " platforms." 257 return nil, "This rockspec for "..rockspec.package.." does not support "..plat.." platforms."
262 end 258 end
263 else 259 else
264 all_negative = false 260 all_negative = false
@@ -270,26 +266,32 @@ local function check_supported_platforms(rockspec)
270 end 266 end
271 if supported == false and not all_negative then 267 if supported == false and not all_negative then
272 local plats = cfg.print_platforms() 268 local plats = cfg.print_platforms()
273 return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plats .. " platforms." 269 return nil, "This rockspec for "..rockspec.package.." does not support "..plats.." platforms."
274 end 270 end
275 end 271 end
276 272
277 return true 273 return true
278end 274end
279 275
280 276--- Check dependencies of a rock and attempt to install any missing ones.
281 277-- Packages are installed using the LuaRocks "install" command.
282 278-- Aborts the program if a dependency could not be fulfilled.
283 279-- @param rockspec table: A rockspec in table format.
284 280-- @param depskey string: Rockspec key to fetch to get dependency table
285 281-- ("dependencies", "build_dependencies", etc.).
286 282-- @param deps_mode string
287 283-- @param verify boolean
288 284-- @param deplock_dir string: dirname of the deplock file
289 285-- @return boolean or (nil, string, [string]): True if no errors occurred, or
290 286-- nil and an error message if any test failed, followed by an optional
291 287-- error code.
292function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir) 288function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir)
289 assert(type(rockspec) == "table")
290 assert(type(depskey) == "string")
291 assert(type(deps_mode) == "string")
292 assert(type(verify) == "boolean" or verify == nil)
293 assert(type(deplock_dir) == "string" or deplock_dir == nil)
294
293 local name = rockspec.name 295 local name = rockspec.name
294 local version = rockspec.version 296 local version = rockspec.version
295 local rocks_provided = rockspec.rocks_provided 297 local rocks_provided = rockspec.rocks_provided
@@ -299,23 +301,16 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
299 util.printout("Using dependencies pinned in lockfile: " .. filename) 301 util.printout("Using dependencies pinned in lockfile: " .. filename)
300 302
301 local get_versions = prepare_get_versions("none", rocks_provided, depskey) 303 local get_versions = prepare_get_versions("none", rocks_provided, depskey)
302 local dnsnamestr, dversionstr
303 for dnsname, dversion in deplocks.each(depskey) do 304 for dnsname, dversion in deplocks.each(depskey) do
304 if type(dnsname) == "string" then 305 local dname, dnamespace = util.split_namespace(dnsname)
305 dnsnamestr = dnsname 306 local dep = queries.new(dname, dnamespace, dversion)
306 end
307 if type(dversion) == "string" then
308 dversionstr = dversion
309 end
310 local dname, dnamespace = util.split_namespace(dnsnamestr)
311 local dep = queries.new(dname, dnamespace, dversionstr)
312 307
313 util.printout(("%s %s is pinned to %s (%s)"):format( 308 util.printout(("%s %s is pinned to %s (%s)"):format(
314 name, version, tostring(dep), rock_status(dep, get_versions))) 309 name, version, tostring(dep), rock_status(dep, get_versions)))
315 310
316 local okfullfill, errfullfill = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey) 311 local ok, err = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey)
317 if not okfullfill then 312 if not ok then
318 return nil, errfullfill 313 return nil, err
319 end 314 end
320 end 315 end
321 util.printout() 316 util.printout()
@@ -329,28 +324,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
329 return nil, err 324 return nil, err
330 end 325 end
331 326
332 deps.report_missing_dependencies(name, version, (rockspec)[depskey], deps_mode, rocks_provided) 327 deps.report_missing_dependencies(name, version, rockspec[depskey], deps_mode, rocks_provided)
333 328
334 util.printout() 329 util.printout()
335 330
336 local get_versions = prepare_get_versions(deps_mode, rocks_provided, depskey) 331 local get_versions = prepare_get_versions(deps_mode, rocks_provided, depskey)
337 for _, dep in ipairs((rockspec)[depskey]) do 332 for _, dep in ipairs(rockspec[depskey]) do
338 333
339 util.printout(("%s %s depends on %s (%s)"):format( 334 util.printout(("%s %s depends on %s (%s)"):format(
340 name, version, tostring(dep), rock_status(dep, get_versions))) 335 name, version, tostring(dep), rock_status(dep, get_versions)))
341 336
342 local ok, found_or_err, _ = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey) 337 local ok, found_or_err, _, no_upgrade = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
343 if ok then 338 if ok then
344 deplocks.add(depskey, dep.name, found_or_err) 339 deplocks.add(depskey, dep.name, found_or_err)
345 else 340 else
346 341 if no_upgrade then
347 342 util.printerr("This version of "..name.." is designed for use with")
348 343 util.printerr(tostring(dep)..", but is configured to avoid upgrading it")
349 344 util.printerr("automatically. Please upgrade "..dep.name.." with")
350 345 util.printerr(" luarocks install "..dep.name)
351 346 util.printerr("or look for a suitable version of "..name.." with")
352 347 util.printerr(" luarocks search "..name)
353 348 end
354 return nil, found_or_err 349 return nil, found_or_err
355 end 350 end
356 end 351 end
@@ -358,28 +353,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
358 return true 353 return true
359end 354end
360 355
361 356--- If filename matches a pattern, return the capture.
362 357-- For example, given "libfoo.so" and "lib?.so" is a pattern,
363 358-- returns "foo" (which can then be used to build names
364 359-- based on other patterns.
365 360-- @param file string: a filename
366 361-- @param pattern string: a pattern, where ? is to be matched by the filename.
367 362-- @return string The pattern, if found, or nil.
368local function deconstruct_pattern(file, pattern) 363local function deconstruct_pattern(file, pattern)
369 local depattern = "^" .. (pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")) .. "$" 364 local depattern = "^"..(pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")).."$"
370 return (file:match(depattern)) 365 return (file:match(depattern))
371end 366end
372 367
373 368--- Construct all possible patterns for a name and add to the files array.
374 369-- Run through the patterns array replacing all occurrences of "?"
375 370-- with the given file name and store them in the files array.
376 371-- @param file string A raw name (e.g. "foo")
377 372-- @param array of string An array of patterns with "?" as the wildcard
378 373-- (e.g. {"?.so", "lib?.so"})
379 374-- @param files The array of constructed names
380local function add_all_patterns(file, patterns, files) 375local function add_all_patterns(file, patterns, files)
381 for _, pattern in ipairs(patterns) do 376 for _, pattern in ipairs(patterns) do
382 table.insert(files, { #files + 1, (pattern:gsub("?", file)) }) 377 table.insert(files, {#files + 1, (pattern:gsub("?", file))})
383 end 378 end
384end 379end
385 380
@@ -393,7 +388,7 @@ local function get_external_deps_dirs(mode)
393 local dirs = { 388 local dirs = {
394 BINDIR = { subdir = subdirs.bin, testfile = "program", pattern = patterns.bin }, 389 BINDIR = { subdir = subdirs.bin, testfile = "program", pattern = patterns.bin },
395 INCDIR = { subdir = subdirs.include, testfile = "header", pattern = patterns.include }, 390 INCDIR = { subdir = subdirs.include, testfile = "header", pattern = patterns.include },
396 LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib }, 391 LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib }
397 } 392 }
398 if mode == "install" then 393 if mode == "install" then
399 dirs.INCDIR = nil 394 dirs.INCDIR = nil
@@ -421,7 +416,7 @@ local function resolve_prefix(prefix, dirs)
421end 416end
422 417
423local function add_patterns_for_file(files, file, patterns) 418local function add_patterns_for_file(files, file, patterns)
424 419 -- If it doesn't look like it contains a filename extension
425 if not (file:match("%.[a-z]+$") or file:match("%.[a-z]+%.")) then 420 if not (file:match("%.[a-z]+$") or file:match("%.[a-z]+%.")) then
426 add_all_patterns(file, patterns, files) 421 add_all_patterns(file, patterns, files)
427 else 422 else
@@ -431,35 +426,26 @@ local function add_patterns_for_file(files, file, patterns)
431 add_all_patterns(matched, patterns, files) 426 add_all_patterns(matched, patterns, files)
432 end 427 end
433 end 428 end
434 table.insert(files, { #files + 1, file }) 429 table.insert(files, {#files + 1, file})
435 end 430 end
436end 431end
437 432
438local function check_external_dependency_at( 433local function check_external_dependency_at(prefix, name, ext_files, vars, dirs, err_files, cache)
439 prefix,
440 name,
441 ext_files,
442 vars,
443 dirs,
444 err_files,
445 cache)
446
447 local fs = require("luarocks.fs") 434 local fs = require("luarocks.fs")
448 cache = cache or {} 435 cache = cache or {}
449 436
450 for dirname, dirdata in util.sortedpairs(dirs) do 437 for dirname, dirdata in util.sortedpairs(dirs) do
451 local paths 438 local paths
452 local path_var_value = vars[name .. "_" .. dirname] 439 local path_var_value = vars[name.."_"..dirname]
453 local dirdatastr = dirdata.subdir
454 if path_var_value then 440 if path_var_value then
455 paths = { path_var_value } 441 paths = { path_var_value }
456 elseif type(dirdatastr) == "table" then 442 elseif type(dirdata.subdir) == "table" then
457 paths = {} 443 paths = {}
458 for i, v in ipairs(dirdatastr) do 444 for i,v in ipairs(dirdata.subdir) do
459 paths[i] = dir.path(prefix, v) 445 paths[i] = dir.path(prefix, v)
460 end 446 end
461 else 447 else
462 paths = { dir.path(prefix, dirdatastr) } 448 paths = { dir.path(prefix, dirdata.subdir) }
463 end 449 end
464 local file_or_files = ext_files[dirdata.testfile] 450 local file_or_files = ext_files[dirdata.testfile]
465 if file_or_files then 451 if file_or_files then
@@ -485,15 +471,15 @@ local function check_external_dependency_at(
485 for _, fa in ipairs(files) do 471 for _, fa in ipairs(files) do
486 472
487 local f = fa[2] 473 local f = fa[2]
488 474 -- small convenience hack
489 if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then 475 if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then
490 f = f:gsub("%.[^.]+$", "." .. cfg.external_lib_extension) 476 f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension)
491 end 477 end
492 478
493 local pattern 479 local pattern
494 if f:match("%*") then 480 if f:match("%*") then
495 pattern = "^" .. f:gsub("([-.+])", "%%%1"):gsub("%*", ".*") .. "$" 481 pattern = "^" .. f:gsub("([-.+])", "%%%1"):gsub("%*", ".*") .. "$"
496 f = "matching " .. f 482 f = "matching "..f
497 end 483 end
498 484
499 for _, d in ipairs(paths) do 485 for _, d in ipairs(paths) do
@@ -516,7 +502,7 @@ local function check_external_dependency_at(
516 dirdata.file = f 502 dirdata.file = f
517 break 503 break
518 else 504 else
519 table.insert(err_files[dirdata.testfile], f .. " in " .. d) 505 table.insert(err_files[dirdata.testfile], f.." in "..d)
520 end 506 end
521 end 507 end
522 if found then 508 if found then
@@ -527,9 +513,9 @@ local function check_external_dependency_at(
527 return nil, dirname, dirdata.testfile 513 return nil, dirname, dirdata.testfile
528 end 514 end
529 else 515 else
530 516 -- When we have a set of subdir suffixes, look for one that exists.
531 517 -- For these reason, we now put "lib" ahead of "" on Windows in our
532 518 -- default set.
533 dirdata.dir = paths[1] 519 dirdata.dir = paths[1]
534 for _, p in ipairs(paths) do 520 for _, p in ipairs(paths) do
535 if fs.exists(p) then 521 if fs.exists(p) then
@@ -541,23 +527,18 @@ local function check_external_dependency_at(
541 end 527 end
542 528
543 for dirname, dirdata in pairs(dirs) do 529 for dirname, dirdata in pairs(dirs) do
544 vars[name .. "_" .. dirname] = dirdata.dir 530 vars[name.."_"..dirname] = dirdata.dir
545 vars[name .. "_" .. dirname .. "_FILE"] = dirdata.file 531 vars[name.."_"..dirname.."_FILE"] = dirdata.file
546 end 532 end
547 vars[name .. "_DIR"] = prefix 533 vars[name.."_DIR"] = prefix
548 return true 534 return true
549end 535end
550 536
551local function check_external_dependency( 537local function check_external_dependency(name, ext_files, vars, mode, cache)
552 name,
553 ext_files,
554 vars,
555 mode,
556 cache)
557 local ok 538 local ok
558 local err_dirname 539 local err_dirname
559 local err_testfile 540 local err_testfile
560 local err_files = { program = {}, header = {}, library = {} } 541 local err_files = {program = {}, header = {}, library = {}}
561 542
562 local dirs = get_external_deps_dirs(mode) 543 local dirs = get_external_deps_dirs(mode)
563 544
@@ -591,7 +572,7 @@ local function check_external_dependency(
591end 572end
592 573
593function deps.autodetect_external_dependencies(build) 574function deps.autodetect_external_dependencies(build)
594 575 -- only applies to the 'builtin' build type
595 if not build or not build.modules then 576 if not build or not build.modules then
596 return nil 577 return nil
597 end 578 end
@@ -600,12 +581,9 @@ function deps.autodetect_external_dependencies(build)
600 local any = false 581 local any = false
601 for _, data in pairs(build.modules) do 582 for _, data in pairs(build.modules) do
602 if type(data) == "table" and data.libraries then 583 if type(data) == "table" and data.libraries then
603 local libraries 584 local libraries = data.libraries
604 local librariesstr = data.libraries 585 if type(libraries) == "string" then
605 if type(librariesstr) == "string" then 586 libraries = { libraries }
606 libraries = { librariesstr }
607 else
608 libraries = librariesstr
609 end 587 end
610 local incdirs = {} 588 local incdirs = {}
611 local libdirs = {} 589 local libdirs = {}
@@ -627,20 +605,21 @@ function deps.autodetect_external_dependencies(build)
627 return any and extdeps or nil 605 return any and extdeps or nil
628end 606end
629 607
630 608--- Set up path-related variables for external dependencies.
631 609-- For each key in the external_dependencies table in the
632 610-- rockspec file, four variables are created: <key>_DIR, <key>_BINDIR,
633 611-- <key>_INCDIR and <key>_LIBDIR. These are not overwritten
634 612-- if already set (e.g. by the LuaRocks config file or through the
635 613-- command-line). Values in the external_dependencies table
636 614-- are tables that may contain a "header" or a "library" field,
637 615-- with filenames to be tested for existence.
638 616-- @param rockspec table: The rockspec table.
639 617-- @param mode string: if "build" is given, checks all files;
640 618-- if "install" is given, do not scan for headers.
641 619-- @return boolean or (nil, string): True if no errors occurred, or
642 620-- nil and an error message if any test failed.
643function deps.check_external_deps(rockspec, mode) 621function deps.check_external_deps(rockspec, mode)
622 assert(rockspec:type() == "rockspec")
644 623
645 if not rockspec.external_dependencies then 624 if not rockspec.external_dependencies then
646 rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build) 625 rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build)
@@ -649,21 +628,21 @@ function deps.check_external_deps(rockspec, mode)
649 return true 628 return true
650 end 629 end
651 630
652 for name, ext_files in util.sortedpairs(rockspec.external_dependencies.queries) do 631 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) 632 local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode)
654 if not ok then 633 if not ok then
655 local lines = { "Could not find " .. err_testfile .. " file for " .. name } 634 local lines = {"Could not find "..err_testfile.." file for "..name}
656 635
657 local err_paths = {} 636 local err_paths = {}
658 for _, err_file in ipairs(err_files[err_testfile]) do 637 for _, err_file in ipairs(err_files[err_testfile]) do
659 if not err_paths[err_file] then 638 if not err_paths[err_file] then
660 err_paths[err_file] = true 639 err_paths[err_file] = true
661 table.insert(lines, " No file " .. err_file) 640 table.insert(lines, " No file "..err_file)
662 end 641 end
663 end 642 end
664 643
665 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.") 644 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.")
666 table.insert(lines, "Example: luarocks install " .. rockspec.name .. " " .. name .. "_DIR=/usr/local") 645 table.insert(lines, "Example: luarocks install "..rockspec.name.." "..name.."_DIR=/usr/local")
667 646
668 return nil, table.concat(lines, "\n"), "dependency" 647 return nil, table.concat(lines, "\n"), "dependency"
669 end 648 end
@@ -671,17 +650,18 @@ function deps.check_external_deps(rockspec, mode)
671 return true 650 return true
672end 651end
673 652
674 653--- Recursively add satisfied dependencies of a package to a table,
675 654-- to build a transitive closure of all dependent packages.
676 655-- Additionally ensures that `dependencies` table of the manifest is up-to-date.
677 656-- @param results table: The results table being built, maps package names to versions.
678 657-- @param mdeps table: The manifest dependencies table.
679 658-- @param name string: Package name.
680 659-- @param version string: Package version.
681function deps.scan_deps(results, mdeps, name, version, deps_mode) 660function deps.scan_deps(results, mdeps, name, version, deps_mode)
682 assert(type(results) == "table") 661 assert(type(results) == "table")
683 assert(type(mdeps) == "table") 662 assert(type(mdeps) == "table")
684 assert(not name:match("/")) 663 assert(type(name) == "string" and not name:match("/"))
664 assert(type(version) == "string")
685 665
686 local fetch = require("luarocks.fetch") 666 local fetch = require("luarocks.fetch")
687 667
@@ -693,7 +673,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
693 local dependencies = mdn[version] 673 local dependencies = mdn[version]
694 local rocks_provided 674 local rocks_provided
695 if not dependencies then 675 if not dependencies then
696 local rockspec = fetch.load_local_rockspec(path.rockspec_file(name, version), false) 676 local rockspec, err = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
697 if not rockspec then 677 if not rockspec then
698 return 678 return
699 end 679 end
@@ -706,7 +686,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
706 686
707 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies") 687 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies")
708 688
709 local matched = match_all_deps(dependencies.queries, get_versions) 689 local matched = match_all_deps(dependencies, get_versions)
710 results[name] = version 690 results[name] = version
711 for _, match in pairs(matched) do 691 for _, match in pairs(matched) do
712 deps.scan_deps(results, mdeps, match.name, match.version, deps_mode) 692 deps.scan_deps(results, mdeps, match.name, match.version, deps_mode)
@@ -756,13 +736,13 @@ local function find_lua_incdir(prefix, luaver, luajitver)
756 end 736 end
757 end 737 end
758 738
759 739 -- not found, will fallback to a default
760 return nil, mainerr 740 return nil, mainerr
761end 741end
762 742
763function deps.check_lua_incdir(vars) 743function deps.check_lua_incdir(vars)
764 if vars.LUA_INCDIR_OK == true then 744 if vars.LUA_INCDIR_OK == true
765 return true 745 then return true
766 end 746 end
767 747
768 local ljv = util.get_luajit_version() 748 local ljv = util.get_luajit_version()
@@ -789,8 +769,8 @@ function deps.check_lua_incdir(vars)
789end 769end
790 770
791function deps.check_lua_libdir(vars) 771function deps.check_lua_libdir(vars)
792 if vars.LUA_LIBDIR_OK == true then 772 if vars.LUA_LIBDIR_OK == true
793 return true 773 then return true
794 end 774 end
795 775
796 local fs = require("luarocks.fs") 776 local fs = require("luarocks.fs")
@@ -823,10 +803,10 @@ function deps.check_lua_libdir(vars)
823 local fd = io.open(filename, "r") 803 local fd = io.open(filename, "r")
824 if fd then 804 if fd then
825 if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then 805 if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
826 806 -- if filename isn't versioned, check file contents
827 local txt = fd:read("*a") 807 local txt = fd:read("*a")
828 ok = txt:match("Lua " .. cfg.lua_version, 1) or 808 ok = txt:match("Lua " .. cfg.lua_version, 1, true)
829 txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1) 809 or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
830 if not ok then 810 if not ok then
831 err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location." 811 err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
832 end 812 end
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 1a9eefde..9b4eb697 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -1,7 +1,8 @@
1local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
1 2
2--- High-level dependency related functions.
3local deps = {} 3local deps = {}
4 4
5
5local cfg = require("luarocks.core.cfg") 6local cfg = require("luarocks.core.cfg")
6local manif = require("luarocks.manif") 7local manif = require("luarocks.manif")
7local path = require("luarocks.path") 8local path = require("luarocks.path")
@@ -12,34 +13,56 @@ local vers = require("luarocks.core.vers")
12local queries = require("luarocks.queries") 13local queries = require("luarocks.queries")
13local deplocks = require("luarocks.deplocks") 14local deplocks = require("luarocks.deplocks")
14 15
15--- Generate a function that matches dep queries against the manifest, 16
16-- taking into account rocks_provided, the list of versions to skip, 17
17-- and the lockfile. 18
18-- @param deps_mode "one", "none", "all" or "order" 19
19-- @param rocks_provided a one-level table mapping names to versions, 20
20-- listing rocks to consider provided by the VM 21
21-- @param rocks_provided table: A table of auto-provided dependencies. 22
22-- by this Lua implementation for the given dependency. 23
23-- @param depskey key to use when matching the lockfile ("dependencies", 24
24-- "build_dependencies", etc.) 25
25-- @param skip_set a two-level table mapping names to versions to 26
26-- boolean, listing rocks that should not be matched 27
27-- @return function(dep): {string}, {string:string}, string, boolean 28
28-- * array of matching versions 29
29-- * map of versions to locations 30
30-- * version matched via lockfile if any 31
31-- * true if rock matched via rocks_provided 32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
32local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set) 59local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set)
33 assert(type(deps_mode) == "string")
34 assert(type(rocks_provided) == "table")
35 assert(type(depskey) == "string")
36 assert(type(skip_set) == "table" or skip_set == nil)
37 60
38 return function(dep) 61 return function(dep)
39 local versions, locations 62 local versions, locations
40 local provided = rocks_provided[dep.name] 63 local provided = rocks_provided[dep.name]
41 if provided then 64 if provided then
42 -- Provided rocks have higher priority than manifest's rocks. 65
43 versions, locations = { provided }, {} 66 versions, locations = { provided }, {}
44 else 67 else
45 if deps_mode == "none" then 68 if deps_mode == "none" then
@@ -63,21 +86,20 @@ local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set
63 end 86 end
64end 87end
65 88
66--- Attempt to match a dependency to an installed rock. 89
67-- @param get_versions a getter function obtained via prepare_get_versions 90
68-- @return (string, string, table) or (nil, nil, table): 91
69-- 1. latest installed version of the rock matching the dependency 92
70-- 2. location where the installed version is installed 93
71-- 3. the 'dep' query table 94
72-- 4. true if provided via VM 95
73-- or 96
74-- 1. nil 97
75-- 2. nil 98
76-- 3. either 'dep' or an alternative query to be used 99
77-- 4. false 100
78local function match_dep(dep, get_versions) 101local function match_dep(dep,
79 assert(type(dep) == "table") 102 get_versions)
80 assert(type(get_versions) == "function")
81 103
82 local versions, locations, lockversion, provided = get_versions(dep) 104 local versions, locations, lockversion, provided = get_versions(dep)
83 105
@@ -105,9 +127,8 @@ local function match_dep(dep, get_versions)
105 return latest_vstring, locations[latest_vstring], dep, provided 127 return latest_vstring, locations[latest_vstring], dep, provided
106end 128end
107 129
108local function match_all_deps(dependencies, get_versions) 130local function match_all_deps(dependencies,
109 assert(type(dependencies) == "table") 131 get_versions)
110 assert(type(get_versions) == "function")
111 132
112 local matched, missing, no_upgrade = {}, {}, {} 133 local matched, missing, no_upgrade = {}, {}, {}
113 134
@@ -116,7 +137,7 @@ local function match_all_deps(dependencies, get_versions)
116 found, _, dep, provided = match_dep(dep, get_versions) 137 found, _, dep, provided = match_dep(dep, get_versions)
117 if found then 138 if found then
118 if not provided then 139 if not provided then
119 matched[dep] = {name = dep.name, version = found} 140 matched[dep] = { name = dep.name, version = found }
120 end 141 end
121 else 142 else
122 if dep.constraints[1] and dep.constraints[1].no_upgrade then 143 if dep.constraints[1] and dep.constraints[1].no_upgrade then
@@ -129,53 +150,41 @@ local function match_all_deps(dependencies, get_versions)
129 return matched, missing, no_upgrade 150 return matched, missing, no_upgrade
130end 151end
131 152
132--- Attempt to match dependencies of a rockspec to installed rocks. 153
133-- @param dependencies table: The table of dependencies. 154
134-- @param rocks_provided table: The table of auto-provided dependencies. 155
135-- @param skip_set table or nil: Program versions to not use as valid matches. 156
136-- Table where keys are program names and values are tables where keys 157
137-- are program versions and values are 'true'. 158
138-- @param deps_mode string: Which trees to check dependencies for 159
139-- @return table, table, table: A table where keys are dependencies parsed 160
140-- in table format and values are tables containing fields 'name' and 161
141-- version' representing matches; a table of missing dependencies 162
142-- parsed as tables; and a table of "no-upgrade" missing dependencies 163
143-- (to be used in plugin modules so that a plugin does not force upgrade of 164
144-- its parent application). 165
145function deps.match_deps(dependencies, rocks_provided, deps_mode, skip_set) 166function deps.match_deps(dependencies, rocks_provided, deps_mode, skip_set)
146 assert(type(dependencies) == "table")
147 assert(type(rocks_provided) == "table")
148 assert(type(skip_set) == "table" or skip_set == nil)
149 assert(type(deps_mode) == "string")
150 167
151 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies", skip_set) 168 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies", skip_set)
152 return match_all_deps(dependencies, get_versions) 169 return match_all_deps(dependencies, get_versions)
153end 170end
154 171
155local function rock_status(dep, get_versions) 172local function rock_status(dep, get_versions)
156 assert(dep:type() == "query")
157 assert(type(get_versions) == "function")
158
159 local installed, _, _, provided = match_dep(dep, get_versions) 173 local installed, _, _, provided = match_dep(dep, get_versions)
160 local installation_type = provided and "provided by VM" or "installed" 174 local installation_type = provided and "provided by VM" or "installed"
161 return installed and installed.." "..installation_type..": success" or "not installed" 175 return installed and installed .. " " .. installation_type .. ": success" or "not installed"
162end 176end
163 177
164--- Check depenendencies of a package and report any missing ones. 178
165-- @param name string: package name. 179
166-- @param version string: package version. 180
167-- @param dependencies table: array of dependencies. 181
168-- @param deps_mode string: Which trees to check dependencies for 182
169-- @param rocks_provided table: A table of auto-dependencies provided 183
170-- by this Lua implementation for the given dependency. 184
171-- "one" for the current default tree, "all" for all trees, 185
172-- "order" for all trees with priority >= the current default, "none" for no trees. 186
173function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided) 187function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided)
174 assert(type(name) == "string")
175 assert(type(version) == "string")
176 assert(type(dependencies) == "table")
177 assert(type(deps_mode) == "string")
178 assert(type(rocks_provided) == "table")
179 188
180 if deps_mode == "none" then 189 if deps_mode == "none" then
181 return 190 return
@@ -200,11 +209,6 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode
200end 209end
201 210
202function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey) 211function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
203 assert(dep:type() == "query")
204 assert(type(deps_mode) == "string" or deps_mode == nil)
205 assert(type(rocks_provided) == "table" or rocks_provided == nil)
206 assert(type(verify) == "boolean" or verify == nil)
207 assert(type(depskey) == "string")
208 212
209 deps_mode = deps_mode or "all" 213 deps_mode = deps_mode or "all"
210 rocks_provided = rocks_provided or {} 214 rocks_provided = rocks_provided or {}
@@ -224,9 +228,9 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
224 228
225 local url, search_err = search.find_suitable_rock(dep) 229 local url, search_err = search.find_suitable_rock(dep)
226 if not url then 230 if not url then
227 return nil, "Could not satisfy dependency "..tostring(dep)..": "..search_err 231 return nil, "Could not satisfy dependency " .. tostring(dep) .. ": " .. search_err
228 end 232 end
229 util.printout("Installing "..url) 233 util.printout("Installing " .. url)
230 local install_args = { 234 local install_args = {
231 rock = url, 235 rock = url,
232 deps_mode = deps_mode, 236 deps_mode = deps_mode,
@@ -235,7 +239,7 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
235 } 239 }
236 local ok, install_err, errcode = install.command(install_args) 240 local ok, install_err, errcode = install.command(install_args)
237 if not ok then 241 if not ok then
238 return nil, "Failed installing dependency: "..url.." - "..install_err, errcode 242 return nil, "Failed installing dependency: " .. url .. " - " .. install_err, errcode
239 end 243 end
240 244
241 found, where = match_dep(dep, get_versions) 245 found, where = match_dep(dep, get_versions)
@@ -246,15 +250,15 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
246end 250end
247 251
248local function check_supported_platforms(rockspec) 252local function check_supported_platforms(rockspec)
249 if rockspec.supported_platforms and next(rockspec.supported_platforms) then 253 if rockspec.supported_platforms and next(rockspec.supported_platforms) ~= nil then
250 local all_negative = true 254 local all_negative = true
251 local supported = false 255 local supported = false
252 for _, plat in pairs(rockspec.supported_platforms) do 256 for _, plat in ipairs(rockspec.supported_platforms) do
253 local neg 257 local neg
254 neg, plat = plat:match("^(!?)(.*)") 258 neg, plat = plat:match("^(!?)(.*)")
255 if neg == "!" then 259 if neg == "!" then
256 if cfg.is_platform(plat) then 260 if cfg.is_platform(plat) then
257 return nil, "This rockspec for "..rockspec.package.." does not support "..plat.." platforms." 261 return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plat .. " platforms."
258 end 262 end
259 else 263 else
260 all_negative = false 264 all_negative = false
@@ -266,32 +270,26 @@ local function check_supported_platforms(rockspec)
266 end 270 end
267 if supported == false and not all_negative then 271 if supported == false and not all_negative then
268 local plats = cfg.print_platforms() 272 local plats = cfg.print_platforms()
269 return nil, "This rockspec for "..rockspec.package.." does not support "..plats.." platforms." 273 return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plats .. " platforms."
270 end 274 end
271 end 275 end
272 276
273 return true 277 return true
274end 278end
275 279
276--- Check dependencies of a rock and attempt to install any missing ones.
277-- Packages are installed using the LuaRocks "install" command.
278-- Aborts the program if a dependency could not be fulfilled.
279-- @param rockspec table: A rockspec in table format.
280-- @param depskey string: Rockspec key to fetch to get dependency table
281-- ("dependencies", "build_dependencies", etc.).
282-- @param deps_mode string
283-- @param verify boolean
284-- @param deplock_dir string: dirname of the deplock file
285-- @return boolean or (nil, string, [string]): True if no errors occurred, or
286-- nil and an error message if any test failed, followed by an optional
287-- error code.
288function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir)
289 assert(type(rockspec) == "table")
290 assert(type(depskey) == "string")
291 assert(type(deps_mode) == "string")
292 assert(type(verify) == "boolean" or verify == nil)
293 assert(type(deplock_dir) == "string" or deplock_dir == nil)
294 280
281
282
283
284
285
286
287
288
289
290
291
292function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir)
295 local name = rockspec.name 293 local name = rockspec.name
296 local version = rockspec.version 294 local version = rockspec.version
297 local rocks_provided = rockspec.rocks_provided 295 local rocks_provided = rockspec.rocks_provided
@@ -301,16 +299,23 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
301 util.printout("Using dependencies pinned in lockfile: " .. filename) 299 util.printout("Using dependencies pinned in lockfile: " .. filename)
302 300
303 local get_versions = prepare_get_versions("none", rocks_provided, depskey) 301 local get_versions = prepare_get_versions("none", rocks_provided, depskey)
302 local dnsnamestr, dversionstr
304 for dnsname, dversion in deplocks.each(depskey) do 303 for dnsname, dversion in deplocks.each(depskey) do
305 local dname, dnamespace = util.split_namespace(dnsname) 304 if type(dnsname) == "string" then
306 local dep = queries.new(dname, dnamespace, dversion) 305 dnsnamestr = dnsname
306 end
307 if type(dversion) == "string" then
308 dversionstr = dversion
309 end
310 local dname, dnamespace = util.split_namespace(dnsnamestr)
311 local dep = queries.new(dname, dnamespace, dversionstr)
307 312
308 util.printout(("%s %s is pinned to %s (%s)"):format( 313 util.printout(("%s %s is pinned to %s (%s)"):format(
309 name, version, tostring(dep), rock_status(dep, get_versions))) 314 name, version, tostring(dep), rock_status(dep, get_versions)))
310 315
311 local ok, err = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey) 316 local okfullfill, errfullfill = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey)
312 if not ok then 317 if not okfullfill then
313 return nil, err 318 return nil, errfullfill
314 end 319 end
315 end 320 end
316 util.printout() 321 util.printout()
@@ -324,28 +329,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
324 return nil, err 329 return nil, err
325 end 330 end
326 331
327 deps.report_missing_dependencies(name, version, rockspec[depskey], deps_mode, rocks_provided) 332 deps.report_missing_dependencies(name, version, (rockspec)[depskey], deps_mode, rocks_provided)
328 333
329 util.printout() 334 util.printout()
330 335
331 local get_versions = prepare_get_versions(deps_mode, rocks_provided, depskey) 336 local get_versions = prepare_get_versions(deps_mode, rocks_provided, depskey)
332 for _, dep in ipairs(rockspec[depskey]) do 337 for _, dep in ipairs((rockspec)[depskey]) do
333 338
334 util.printout(("%s %s depends on %s (%s)"):format( 339 util.printout(("%s %s depends on %s (%s)"):format(
335 name, version, tostring(dep), rock_status(dep, get_versions))) 340 name, version, tostring(dep), rock_status(dep, get_versions)))
336 341
337 local ok, found_or_err, _, no_upgrade = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey) 342 local okfulfill, found_or_err, _ = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
338 if ok then 343 if okfulfill then
339 deplocks.add(depskey, dep.name, found_or_err) 344 deplocks.add(depskey, dep.name, found_or_err)
340 else 345 else
341 if no_upgrade then 346
342 util.printerr("This version of "..name.." is designed for use with") 347
343 util.printerr(tostring(dep)..", but is configured to avoid upgrading it") 348
344 util.printerr("automatically. Please upgrade "..dep.name.." with") 349
345 util.printerr(" luarocks install "..dep.name) 350
346 util.printerr("or look for a suitable version of "..name.." with") 351
347 util.printerr(" luarocks search "..name) 352
348 end 353
349 return nil, found_or_err 354 return nil, found_or_err
350 end 355 end
351 end 356 end
@@ -353,28 +358,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
353 return true 358 return true
354end 359end
355 360
356--- If filename matches a pattern, return the capture. 361
357-- For example, given "libfoo.so" and "lib?.so" is a pattern, 362
358-- returns "foo" (which can then be used to build names 363
359-- based on other patterns. 364
360-- @param file string: a filename 365
361-- @param pattern string: a pattern, where ? is to be matched by the filename. 366
362-- @return string The pattern, if found, or nil. 367
363local function deconstruct_pattern(file, pattern) 368local function deconstruct_pattern(file, pattern)
364 local depattern = "^"..(pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")).."$" 369 local depattern = "^" .. (pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")) .. "$"
365 return (file:match(depattern)) 370 return (file:match(depattern))
366end 371end
367 372
368--- Construct all possible patterns for a name and add to the files array. 373
369-- Run through the patterns array replacing all occurrences of "?" 374
370-- with the given file name and store them in the files array. 375
371-- @param file string A raw name (e.g. "foo") 376
372-- @param array of string An array of patterns with "?" as the wildcard 377
373-- (e.g. {"?.so", "lib?.so"}) 378
374-- @param files The array of constructed names 379
375local function add_all_patterns(file, patterns, files) 380local function add_all_patterns(file, patterns, files)
376 for _, pattern in ipairs(patterns) do 381 for _, pattern in ipairs(patterns) do
377 table.insert(files, {#files + 1, (pattern:gsub("?", file))}) 382 table.insert(files, { #files + 1, (pattern:gsub("?", file)) })
378 end 383 end
379end 384end
380 385
@@ -388,7 +393,7 @@ local function get_external_deps_dirs(mode)
388 local dirs = { 393 local dirs = {
389 BINDIR = { subdir = subdirs.bin, testfile = "program", pattern = patterns.bin }, 394 BINDIR = { subdir = subdirs.bin, testfile = "program", pattern = patterns.bin },
390 INCDIR = { subdir = subdirs.include, testfile = "header", pattern = patterns.include }, 395 INCDIR = { subdir = subdirs.include, testfile = "header", pattern = patterns.include },
391 LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib } 396 LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib },
392 } 397 }
393 if mode == "install" then 398 if mode == "install" then
394 dirs.INCDIR = nil 399 dirs.INCDIR = nil
@@ -416,7 +421,7 @@ local function resolve_prefix(prefix, dirs)
416end 421end
417 422
418local function add_patterns_for_file(files, file, patterns) 423local function add_patterns_for_file(files, file, patterns)
419 -- If it doesn't look like it contains a filename extension 424
420 if not (file:match("%.[a-z]+$") or file:match("%.[a-z]+%.")) then 425 if not (file:match("%.[a-z]+$") or file:match("%.[a-z]+%.")) then
421 add_all_patterns(file, patterns, files) 426 add_all_patterns(file, patterns, files)
422 else 427 else
@@ -426,26 +431,35 @@ local function add_patterns_for_file(files, file, patterns)
426 add_all_patterns(matched, patterns, files) 431 add_all_patterns(matched, patterns, files)
427 end 432 end
428 end 433 end
429 table.insert(files, {#files + 1, file}) 434 table.insert(files, { #files + 1, file })
430 end 435 end
431end 436end
432 437
433local function check_external_dependency_at(prefix, name, ext_files, vars, dirs, err_files, cache) 438local function check_external_dependency_at(
439 prefix,
440 name,
441 ext_files,
442 vars,
443 dirs,
444 err_files,
445 cache)
446
434 local fs = require("luarocks.fs") 447 local fs = require("luarocks.fs")
435 cache = cache or {} 448 cache = cache or {}
436 449
437 for dirname, dirdata in util.sortedpairs(dirs) do 450 for dirname, dirdata in util.sortedpairs(dirs) do
438 local paths 451 local paths
439 local path_var_value = vars[name.."_"..dirname] 452 local path_var_value = vars[name .. "_" .. dirname]
453 local dirdatastr = dirdata.subdir
440 if path_var_value then 454 if path_var_value then
441 paths = { path_var_value } 455 paths = { path_var_value }
442 elseif type(dirdata.subdir) == "table" then 456 elseif type(dirdatastr) == "table" then
443 paths = {} 457 paths = {}
444 for i,v in ipairs(dirdata.subdir) do 458 for i, v in ipairs(dirdatastr) do
445 paths[i] = dir.path(prefix, v) 459 paths[i] = dir.path(prefix, v)
446 end 460 end
447 else 461 else
448 paths = { dir.path(prefix, dirdata.subdir) } 462 paths = { dir.path(prefix, dirdatastr) }
449 end 463 end
450 local file_or_files = ext_files[dirdata.testfile] 464 local file_or_files = ext_files[dirdata.testfile]
451 if file_or_files then 465 if file_or_files then
@@ -471,15 +485,15 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
471 for _, fa in ipairs(files) do 485 for _, fa in ipairs(files) do
472 486
473 local f = fa[2] 487 local f = fa[2]
474 -- small convenience hack 488
475 if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then 489 if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then
476 f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension) 490 f = f:gsub("%.[^.]+$", "." .. cfg.external_lib_extension)
477 end 491 end
478 492
479 local pattern 493 local pattern
480 if f:match("%*") then 494 if f:match("%*") then
481 pattern = "^" .. f:gsub("([-.+])", "%%%1"):gsub("%*", ".*") .. "$" 495 pattern = "^" .. f:gsub("([-.+])", "%%%1"):gsub("%*", ".*") .. "$"
482 f = "matching "..f 496 f = "matching " .. f
483 end 497 end
484 498
485 for _, d in ipairs(paths) do 499 for _, d in ipairs(paths) do
@@ -502,7 +516,7 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
502 dirdata.file = f 516 dirdata.file = f
503 break 517 break
504 else 518 else
505 table.insert(err_files[dirdata.testfile], f.." in "..d) 519 table.insert(err_files[dirdata.testfile], f .. " in " .. d)
506 end 520 end
507 end 521 end
508 if found then 522 if found then
@@ -513,9 +527,9 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
513 return nil, dirname, dirdata.testfile 527 return nil, dirname, dirdata.testfile
514 end 528 end
515 else 529 else
516 -- When we have a set of subdir suffixes, look for one that exists. 530
517 -- For these reason, we now put "lib" ahead of "" on Windows in our 531
518 -- default set. 532
519 dirdata.dir = paths[1] 533 dirdata.dir = paths[1]
520 for _, p in ipairs(paths) do 534 for _, p in ipairs(paths) do
521 if fs.exists(p) then 535 if fs.exists(p) then
@@ -527,18 +541,23 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
527 end 541 end
528 542
529 for dirname, dirdata in pairs(dirs) do 543 for dirname, dirdata in pairs(dirs) do
530 vars[name.."_"..dirname] = dirdata.dir 544 vars[name .. "_" .. dirname] = dirdata.dir
531 vars[name.."_"..dirname.."_FILE"] = dirdata.file 545 vars[name .. "_" .. dirname .. "_FILE"] = dirdata.file
532 end 546 end
533 vars[name.."_DIR"] = prefix 547 vars[name .. "_DIR"] = prefix
534 return true 548 return true
535end 549end
536 550
537local function check_external_dependency(name, ext_files, vars, mode, cache) 551local function check_external_dependency(
552 name,
553 ext_files,
554 vars,
555 mode,
556 cache)
538 local ok 557 local ok
539 local err_dirname 558 local err_dirname
540 local err_testfile 559 local err_testfile
541 local err_files = {program = {}, header = {}, library = {}} 560 local err_files = { program = {}, header = {}, library = {} }
542 561
543 local dirs = get_external_deps_dirs(mode) 562 local dirs = get_external_deps_dirs(mode)
544 563
@@ -572,7 +591,7 @@ local function check_external_dependency(name, ext_files, vars, mode, cache)
572end 591end
573 592
574function deps.autodetect_external_dependencies(build) 593function deps.autodetect_external_dependencies(build)
575 -- only applies to the 'builtin' build type 594
576 if not build or not build.modules then 595 if not build or not build.modules then
577 return nil 596 return nil
578 end 597 end
@@ -581,9 +600,12 @@ function deps.autodetect_external_dependencies(build)
581 local any = false 600 local any = false
582 for _, data in pairs(build.modules) do 601 for _, data in pairs(build.modules) do
583 if type(data) == "table" and data.libraries then 602 if type(data) == "table" and data.libraries then
584 local libraries = data.libraries 603 local libraries
585 if type(libraries) == "string" then 604 local librariesstr = data.libraries
586 libraries = { libraries } 605 if type(librariesstr) == "string" then
606 libraries = { librariesstr }
607 else
608 libraries = librariesstr
587 end 609 end
588 local incdirs = {} 610 local incdirs = {}
589 local libdirs = {} 611 local libdirs = {}
@@ -605,21 +627,20 @@ function deps.autodetect_external_dependencies(build)
605 return any and extdeps or nil 627 return any and extdeps or nil
606end 628end
607 629
608--- Set up path-related variables for external dependencies. 630
609-- For each key in the external_dependencies table in the 631
610-- rockspec file, four variables are created: <key>_DIR, <key>_BINDIR, 632
611-- <key>_INCDIR and <key>_LIBDIR. These are not overwritten 633
612-- if already set (e.g. by the LuaRocks config file or through the 634
613-- command-line). Values in the external_dependencies table 635
614-- are tables that may contain a "header" or a "library" field, 636
615-- with filenames to be tested for existence. 637
616-- @param rockspec table: The rockspec table. 638
617-- @param mode string: if "build" is given, checks all files; 639
618-- if "install" is given, do not scan for headers. 640
619-- @return boolean or (nil, string): True if no errors occurred, or 641
620-- nil and an error message if any test failed. 642
621function deps.check_external_deps(rockspec, mode) 643function deps.check_external_deps(rockspec, mode)
622 assert(rockspec:type() == "rockspec")
623 644
624 if not rockspec.external_dependencies then 645 if not rockspec.external_dependencies then
625 rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build) 646 rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build)
@@ -628,21 +649,21 @@ function deps.check_external_deps(rockspec, mode)
628 return true 649 return true
629 end 650 end
630 651
631 for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do 652 for name, ext_files in util.sortedpairs(rockspec.external_dependencies.queries) do
632 local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode) 653 local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode)
633 if not ok then 654 if not ok then
634 local lines = {"Could not find "..err_testfile.." file for "..name} 655 local lines = { "Could not find " .. err_testfile .. " file for " .. name }
635 656
636 local err_paths = {} 657 local err_paths = {}
637 for _, err_file in ipairs(err_files[err_testfile]) do 658 for _, err_file in ipairs(err_files[err_testfile]) do
638 if not err_paths[err_file] then 659 if not err_paths[err_file] then
639 err_paths[err_file] = true 660 err_paths[err_file] = true
640 table.insert(lines, " No file "..err_file) 661 table.insert(lines, " No file " .. err_file)
641 end 662 end
642 end 663 end
643 664
644 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.") 665 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.")
645 table.insert(lines, "Example: luarocks install "..rockspec.name.." "..name.."_DIR=/usr/local") 666 table.insert(lines, "Example: luarocks install " .. rockspec.name .. " " .. name .. "_DIR=/usr/local")
646 667
647 return nil, table.concat(lines, "\n"), "dependency" 668 return nil, table.concat(lines, "\n"), "dependency"
648 end 669 end
@@ -650,18 +671,17 @@ function deps.check_external_deps(rockspec, mode)
650 return true 671 return true
651end 672end
652 673
653--- Recursively add satisfied dependencies of a package to a table, 674
654-- to build a transitive closure of all dependent packages. 675
655-- Additionally ensures that `dependencies` table of the manifest is up-to-date. 676
656-- @param results table: The results table being built, maps package names to versions. 677
657-- @param mdeps table: The manifest dependencies table. 678
658-- @param name string: Package name. 679
659-- @param version string: Package version. 680
660function deps.scan_deps(results, mdeps, name, version, deps_mode) 681function deps.scan_deps(results, mdeps, name, version, deps_mode)
661 assert(type(results) == "table") 682 assert(type(results) == "table")
662 assert(type(mdeps) == "table") 683 assert(type(mdeps) == "table")
663 assert(type(name) == "string" and not name:match("/")) 684 assert(not name:match("/"))
664 assert(type(version) == "string")
665 685
666 local fetch = require("luarocks.fetch") 686 local fetch = require("luarocks.fetch")
667 687
@@ -673,7 +693,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
673 local dependencies = mdn[version] 693 local dependencies = mdn[version]
674 local rocks_provided 694 local rocks_provided
675 if not dependencies then 695 if not dependencies then
676 local rockspec, err = fetch.load_local_rockspec(path.rockspec_file(name, version), false) 696 local rockspec = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
677 if not rockspec then 697 if not rockspec then
678 return 698 return
679 end 699 end
@@ -686,7 +706,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
686 706
687 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies") 707 local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies")
688 708
689 local matched = match_all_deps(dependencies, get_versions) 709 local matched = match_all_deps(dependencies.queries, get_versions)
690 results[name] = version 710 results[name] = version
691 for _, match in pairs(matched) do 711 for _, match in pairs(matched) do
692 deps.scan_deps(results, mdeps, match.name, match.version, deps_mode) 712 deps.scan_deps(results, mdeps, match.name, match.version, deps_mode)
@@ -736,13 +756,13 @@ local function find_lua_incdir(prefix, luaver, luajitver)
736 end 756 end
737 end 757 end
738 758
739 -- not found, will fallback to a default 759
740 return nil, mainerr 760 return nil, mainerr
741end 761end
742 762
743function deps.check_lua_incdir(vars) 763function deps.check_lua_incdir(vars)
744 if vars.LUA_INCDIR_OK == true 764 if vars.LUA_INCDIR_OK == true then
745 then return true 765 return true
746 end 766 end
747 767
748 local ljv = util.get_luajit_version() 768 local ljv = util.get_luajit_version()
@@ -769,8 +789,8 @@ function deps.check_lua_incdir(vars)
769end 789end
770 790
771function deps.check_lua_libdir(vars) 791function deps.check_lua_libdir(vars)
772 if vars.LUA_LIBDIR_OK == true 792 if vars.LUA_LIBDIR_OK == true then
773 then return true 793 return true
774 end 794 end
775 795
776 local fs = require("luarocks.fs") 796 local fs = require("luarocks.fs")
@@ -803,10 +823,10 @@ function deps.check_lua_libdir(vars)
803 local fd = io.open(filename, "r") 823 local fd = io.open(filename, "r")
804 if fd then 824 if fd then
805 if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then 825 if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
806 -- if filename isn't versioned, check file contents 826
807 local txt = fd:read("*a") 827 local txt = fd:read("*a")
808 ok = txt:match("Lua " .. cfg.lua_version, 1, true) 828 ok = txt:find("Lua " .. cfg.lua_version, 1, true) or
809 or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true) 829 txt:find("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
810 if not ok then 830 if not ok then
811 err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location." 831 err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
812 end 832 end
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 13183cea..d9d66892 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -26,18 +26,18 @@ local type Tree = t.Tree
26local type q = require("luarocks.core.types.query") 26local type q = require("luarocks.core.types.query")
27local type Query = q.Query 27local type Query = q.Query
28 28
29local type v = require("luarocks.core.types.version") 29local type ver = require("luarocks.core.types.version")
30local type Version = v.Version 30local type Version = ver.Version
31 31
32local type p = require("luarocks.core.types.persist") 32local type per = require("luarocks.core.types.persist")
33local type PersistableTable = p.PersistableTable 33local type PersistableTable = per.PersistableTable
34 34
35local type res = require("luarocks.core.types.result") 35local type res = require("luarocks.core.types.result")
36local type Result = res.Result 36local type Result = res.Result
37 37
38local type d = require("luarocks.core.types.dir") 38local type dr = require("luarocks.core.types.dir")
39local type Dir = d.Dir 39local type Dir = dr.Dir
40local type Dirs = d.Dirs 40local type Dirs = dr.Dirs
41 41
42--- Generate a function that matches dep queries against the manifest, 42--- Generate a function that matches dep queries against the manifest,
43-- taking into account rocks_provided, the list of versions to skip, 43-- taking into account rocks_provided, the list of versions to skip,
@@ -339,8 +339,8 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: string, deps_mod
339 util.printout(("%s %s depends on %s (%s)"):format( 339 util.printout(("%s %s depends on %s (%s)"):format(
340 name, version, tostring(dep), rock_status(dep, get_versions))) 340 name, version, tostring(dep), rock_status(dep, get_versions)))
341 341
342 local ok, found_or_err, _ = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey) 342 local okfulfill, found_or_err, _ = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
343 if ok then 343 if okfulfill then
344 deplocks.add(depskey, dep.name, found_or_err) 344 deplocks.add(depskey, dep.name, found_or_err)
345 else 345 else
346 -- if no_upgrade then 346 -- if no_upgrade then
@@ -825,8 +825,8 @@ function deps.check_lua_libdir(vars: Variables): boolean, string, string, {strin
825 if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then 825 if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
826 -- if filename isn't versioned, check file contents 826 -- if filename isn't versioned, check file contents
827 local txt = fd:read("*a") 827 local txt = fd:read("*a")
828 ok = txt:match("Lua " .. cfg.lua_version, 1) -- removed last parameter since not needed (true) 828 ok = txt:find("Lua " .. cfg.lua_version, 1, true)
829 or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1) -- removed last parameter since not needed (true) 829 or txt:find("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
830 if not ok then 830 if not ok then
831 err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location." 831 err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
832 end 832 end