5 files changed, 65 insertions, 34 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 427ab7c9..f9ef4c44 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -112,9 +112,15 @@ function run(rockspec)
          def:write("luaopen_"..name:gsub("%.", "_").."\n")
          def:close()
          local ok = execute(variables.LD, "-dll", "-def:"..deffile, "-out:"..library, dir.path(variables.LUA_LIBDIR, variables.LUALIB), unpack(extras))
-         local manifestfile = basename..".dll.manifest"
+         local basedir = ""
+         if name:find("%.") ~= nil then
+            basedir = name:gsub("%.%w+$", "\\")
+            basedir = basedir:gsub("%.", "\\")
+         end
+         local manifestfile = basedir .. basename..".dll.manifest"
+
          if ok and fs.exists(manifestfile) then
-            ok = execute(variables.MT, "-manifest", manifestfile, "-outputresource:"..basename..".dll;2")
+            ok = execute(variables.MT, "-manifest", manifestfile, "-outputresource:"..basedir..basename..".dll;2")
          end
          return ok
       end
@@ -250,7 +256,7 @@ function run(rockspec)
    end
    if fs.is_dir("lua") then
       local ok, err = fs.copy_contents("lua", luadir)
-      if not ok then 
+      if not ok then
          return nil, "Failed copying contents of 'lua' directory: "..err
       end
    end
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 3a5294f5..2904146b 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -265,6 +265,8 @@ local defaults = {
       lib = "lib",
       include = "include"
    },
+
+   rocks_provided = {}
 }
 
 if detected.windows then
@@ -453,16 +455,33 @@ defaults.variables.OBJ_EXTENSION = defaults.obj_extension
 defaults.variables.LUAROCKS_PREFIX = site_config.LUAROCKS_PREFIX
 defaults.variables.LUA = site_config.LUA_DIR_SET and (defaults.variables.LUA_BINDIR.."/"..defaults.lua_interpreter) or defaults.lua_interpreter
 
--- Use defaults:
+-- Add built-in modules to rocks_provided
+defaults.rocks_provided["lua"] = lua_version.."-1"
 
--- Populate values from 'defaults.variables' in 'variables' if they were not
--- already set by user.
-if not _M.variables then
-   _M.variables = {}
+if lua_version >= "5.2" then
+   -- Lua 5.2+
+   defaults.rocks_provided["bit32"] = lua_version.."-1"
 end
-for k,v in pairs(defaults.variables) do
-   if not _M.variables[k] then
-      _M.variables[k] = v
+
+if package.loaded.jit then
+   -- LuaJIT
+   local lj_version = package.loaded.jit.version:match("LuaJIT (.*)"):gsub("%-","")
+   --defaults.rocks_provided["luajit"] = lj_version.."-1"
+   defaults.rocks_provided["luabitop"] = lj_version.."-1"
+end
+
+-- Use defaults:
+
+-- Populate some arrays with values from their 'defaults' counterparts
+-- if they were not already set by user.
+for _, entry in ipairs({"variables", "rocks_provided"}) do
+   if not _M[entry] then
+      _M[entry] = {}
+   end
+   for k,v in pairs(defaults[entry]) do
+      if not _M[entry][k] then
+         _M[entry][k] = v
+      end
    end
 end
 
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 0c6bb8d5..116b4bbb 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -323,9 +323,10 @@ end
 local function match_dep(dep, blacklist, deps_mode)
    assert(type(dep) == "table")
 
-   local versions
-   if dep.name == "lua" then
-      versions = { cfg.lua_version }
+   local versions = cfg.rocks_provided[dep.name]
+   if cfg.rocks_provided[dep.name] then
+      -- provided rocks have higher priority than manifest's rocks
+      versions = { cfg.rocks_provided[dep.name] }
    else
       versions = manif_core.get_versions(dep.name, deps_mode)
    end
@@ -360,17 +361,12 @@ local function match_dep(dep, blacklist, deps_mode)
    end
 end
 
-local whitelist = {}
-if cfg.lua_version == "5.2" then
-   whitelist["bit32"] = true
-end
-
 --- Attempt to match dependencies of a rockspec to installed rocks.
 -- @param rockspec table: The rockspec loaded as a table.
 -- @param blacklist table or nil: Program versions to not use as valid matches.
 -- Table where keys are program names and values are tables where keys
 -- are program versions and values are 'true'.
--- @return table, table: A table where keys are dependencies parsed
+-- @return table, table, table: A table where keys are dependencies parsed
 -- in table format and values are tables containing fields 'name' and
 -- version' representing matches; a table of missing dependencies
 -- parsed as tables; and a table of "no-upgrade" missing dependencies
@@ -382,18 +378,16 @@ function match_deps(rockspec, blacklist, deps_mode)
    local matched, missing, no_upgrade = {}, {}, {}
    
    for _, dep in ipairs(rockspec.dependencies) do
-      if not whitelist[dep.name] then
-         local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
-         if found then
-            if dep.name ~= "lua" then 
-               matched[dep] = found
-            end
+      local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
+      if found then
+         if not cfg.rocks_provided[dep.name] then
+            matched[dep] = found
+         end
+      else
+         if dep.constraints[1] and dep.constraints[1].no_upgrade then
+            no_upgrade[dep.name] = dep
          else
-            if dep.constraints[1] and dep.constraints[1].no_upgrade then
-               no_upgrade[dep.name] = dep
-            else
-               missing[dep.name] = dep
-            end
+            missing[dep.name] = dep
          end
       end
    end
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua
index aa3b2781..d828a359 100644
--- a/src/luarocks/loader.lua
+++ b/src/luarocks/loader.lua
@@ -6,8 +6,8 @@
 -- used to load previous modules, so that the loader chooses versions
 -- that are declared to be compatible with the ones loaded earlier.
 local global_env = _G
-local package, require, ipairs, pairs, table, type, next, unpack =
-      package, require, ipairs, pairs, table, type, next, unpack
+local package, require, ipairs, pairs, table, type, next, unpack, tostring, error =
+      package, require, ipairs, pairs, table, type, next, unpack, tostring, error
 
 module("luarocks.loader")
 
@@ -146,7 +146,7 @@ local function select_module(module, filter_module_name)
             local name, version = entry:match("^([^/]*)/(.*)$")
             local module_name = tree.manifest.repository[name][version][1].modules[module]
             if type(module_name) ~= "string" then
-               error("Invalid format in manifest file (invalid data for "..tostring(name).." "..tostring(version)..")")
+               error("Invalid data in manifest file for module "..tostring(module).." (invalid data for "..tostring(name).." "..tostring(version)..")")
             end
             module_name = filter_module_name(module_name, name, version, tree.tree, i)
             if context[name] == version then
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 1fc1f9a1..356e06e8 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -209,6 +209,12 @@ function search_repos(query)
          end
       end
    end
+   -- search through rocks in cfg.rocks_provided
+   local provided_repo = "provided by VM or rocks_provided"
+   local name, versions
+   for name, versions in pairs(cfg.rocks_provided) do
+      store_if_match(results, provided_repo, name, versions, "installed", query)
+   end
    return results
 end
 
@@ -273,6 +279,12 @@ function find_suitable_rock(query)
    if not first then
       return nil, "No results matching query were found."
    elseif not next(results, first) then
+      if cfg.rocks_provided[query.name] ~= nil then
+         -- do not install versions that listed in cfg.rocks_provided
+         return nil, "Rock "..query.name..
+                     " "..cfg.rocks_provided[query.name]..
+                     " was found but it is provided by VM or 'rocks_provided' in the config file."
+      end
       return pick_latest_version(query.name, results[first])
    else
       return results