14 files changed, 70 insertions, 50 deletions

diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index ea132a3e..b9954cf4 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -27,11 +27,6 @@ function cmake.run(rockspec, no_install)
    local build = rockspec.build
    local variables = build.variables or {}
 
-
-   variables.CMAKE_MODULE_PATH = os.getenv("CMAKE_MODULE_PATH")
-   variables.CMAKE_LIBRARY_PATH = os.getenv("CMAKE_LIBRARY_PATH")
-   variables.CMAKE_INCLUDE_PATH = os.getenv("CMAKE_INCLUDE_PATH")
-
    util.variable_substitutions(variables, rockspec.variables)
 
    local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake")
diff --git a/src/luarocks/build/cmake.tl b/src/luarocks/build/cmake.tl
index 9a512d1e..35e64bd6 100644
--- a/src/luarocks/build/cmake.tl
+++ b/src/luarocks/build/cmake.tl
@@ -27,11 +27,6 @@ function cmake.run(rockspec: Rockspec, no_install: boolean): boolean, string, st
    local build = rockspec.build as cmake.CMakeBuild
    local variables = build.variables or {}
 
-   -- Pass Env variables
-   variables.CMAKE_MODULE_PATH=os.getenv("CMAKE_MODULE_PATH")
-   variables.CMAKE_LIBRARY_PATH=os.getenv("CMAKE_LIBRARY_PATH")
-   variables.CMAKE_INCLUDE_PATH=os.getenv("CMAKE_INCLUDE_PATH")
-
    util.variable_substitutions(variables, rockspec.variables)
 
    local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake")
diff --git a/src/luarocks/cmd/upload.lua b/src/luarocks/cmd/upload.lua
index 755dd4e7..e4319bb1 100644
--- a/src/luarocks/cmd/upload.lua
+++ b/src/luarocks/cmd/upload.lua
@@ -1,4 +1,4 @@
-local _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 string = _tl_compat and _tl_compat.string or string
+local _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 math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string
 local upload = { Response = { version = {} } }
 
 
@@ -132,7 +132,8 @@ function upload.command(args)
          return nil, "Invalid response from server."
       end
       util.printout(("Sending " .. tostring(rock_fname) .. " ..."))
-      res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
+      local id = math.tointeger(res.version.id)
+      res, err = api:method("upload_rock/" .. ("%d"):format(id), nil, {
          rock_file = multipart.new_file(rock_fname),
          rock_sig = rock_sigfname and multipart.new_file(rock_sigfname),
       })
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index 5b6e3314..a12b30c0 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -132,7 +132,8 @@ function upload.command(args: Args): boolean, string, string
          return nil, "Invalid response from server."
       end
       util.printout(("Sending " .. tostring(rock_fname) .. " ..."))
-      res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
+      local id = math.tointeger(res.version.id)
+      res, err = api:method("upload_rock/" .. ("%d"):format(id), nil, {
          rock_file = multipart.new_file(rock_fname),
          rock_sig = rock_sigfname and multipart.new_file(rock_sigfname),
       }) as (Response, string)
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 8c2d7d79..1be65c27 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -413,13 +413,24 @@ local function make_defaults(lua_version, target_cpu, platforms, home)
    end
 
    if platforms.cygwin then
-      defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds
+      defaults.lib_extension = "dll"
       defaults.arch = "cygwin-"..target_cpu
       defaults.cmake_generator = "Unix Makefiles"
       defaults.variables.CC = "echo -llua | xargs " .. (os.getenv("CC") or "gcc")
       defaults.variables.LD = "echo -llua | xargs " .. (os.getenv("CC") or "gcc")
       defaults.variables.LIBFLAG = "-shared"
       defaults.link_lua_explicitly = true
+      defaults.external_deps_patterns = {
+         bin = { "?.exe", "?.bat", "?" },
+         lib = { "cyg?.dll", "lib?.so", "lib?.so.*", "lib?.dll.a", "?.dll.a",
+                 "lib?.a", "lib?.dll", "?.dll" },
+         include = { "?.h" }
+      }
+      defaults.runtime_external_deps_patterns = {
+         bin = { "?.exe", "?.bat" },
+         lib = { "cyg?.dll", "lib?.so", "?.dll", "lib?.dll" },
+         include = { "?.h" }
+      }
    end
 
    if platforms.msys then
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index e02d4694..5802601e 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -1,4 +1,4 @@
-local _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; local type = type
+local _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 math = _tl_compat and _tl_compat.math or math; 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; local type = type
 
 local deps = {}
 
@@ -201,7 +201,7 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode
             first_missing_dep = false
          end
 
-         util.printout(("   %s (%s)"):format(tostring(depq), rock_status(depq, get_versions)))
+         util.printout(("   %s (%s)"):format(tostring(depq), (rock_status(depq, get_versions))))
       end
    end
 end
@@ -301,7 +301,7 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
          local depq = queries.new(dname, dnamespace, dversion)
 
          util.printout(("%s %s is pinned to %s (%s)"):format(
-         name, version, tostring(depq), rock_status(depq, get_versions)))
+         name, version, tostring(depq), (rock_status(depq, get_versions))))
 
          local okfullfill, errfullfill = deps.fulfill_dependency(depq, "none", rocks_provided, verify, depskey)
          if not okfullfill then
@@ -327,11 +327,14 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
    for _, depq in ipairs((rockspec)[depskey].queries) do
 
       util.printout(("%s %s depends on %s (%s)"):format(
-      name, version, tostring(depq), rock_status(depq, get_versions)))
+      name, version, tostring(depq), (rock_status(depq, get_versions))))
 
-      local okfulfill, found_or_err, _ = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
+      local okfulfill, version_or_err, tree = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
       if okfulfill then
-         deplocks.add(depskey, depq.name, found_or_err)
+         deplocks.add(depskey, depq.name, version_or_err)
+         if tree and rockspec:format_is_at_least("3.1") then
+            rockspec.variables[depq.name:upper() .. "_ROCKDIR"] = path.install_dir(depq.name, version_or_err, tree)
+         end
       else
          if depq.constraints and depq.constraints[1] and depq.constraints[1].no_upgrade then
             util.printerr("This version of " .. name .. " is designed for use with")
@@ -341,7 +344,7 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
             util.printerr("or look for a suitable version of " .. name .. " with")
             util.printerr("   luarocks search " .. name)
          end
-         return nil, found_or_err
+         return nil, version_or_err
       end
    end
 
@@ -703,7 +706,7 @@ end
 
 local function lua_h_exists(d, luaver)
    local major, minor = luaver:match("(%d+)%.(%d+)")
-   local luanum = ("%s%02d"):format(major, tonumber(minor))
+   local luanum = ("%s%02d"):format(major, math.tointeger(minor))
 
    local lua_h = dir.path(d, "lua.h")
    local fd = io.open(lua_h)
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 5ca9c879..d127288e 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -201,7 +201,7 @@ function deps.report_missing_dependencies(name: string, version: string, depende
             first_missing_dep = false
          end
 
-         util.printout(("   %s (%s)"):format(tostring(depq), rock_status(depq, get_versions)))
+         util.printout(("   %s (%s)"):format(tostring(depq), (rock_status(depq, get_versions))))
       end
    end
 end
@@ -301,7 +301,7 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo
          local depq = queries.new(dname, dnamespace, dversion)
 
          util.printout(("%s %s is pinned to %s (%s)"):format(
-            name, version, tostring(depq), rock_status(depq, get_versions)))
+            name, version, tostring(depq), (rock_status(depq, get_versions))))
 
          local okfullfill, errfullfill = deps.fulfill_dependency(depq, "none", rocks_provided, verify, depskey)
          if not okfullfill then
@@ -327,11 +327,14 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo
    for _, depq in ipairs((rockspec as {string: Dependencies})[depskey].queries) do
 
       util.printout(("%s %s depends on %s (%s)"):format(
-         name, version, tostring(depq), rock_status(depq, get_versions)))
+         name, version, tostring(depq), (rock_status(depq, get_versions))))
 
-      local okfulfill, found_or_err, _ = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
+      local okfulfill, version_or_err, tree = deps.fulfill_dependency(depq, deps_mode, rocks_provided, verify, depskey)
       if okfulfill then
-         deplocks.add(depskey, depq.name, found_or_err)
+         deplocks.add(depskey, depq.name, version_or_err)
+         if tree and rockspec:format_is_at_least("3.1") then
+            rockspec.variables[depq.name:upper() .. "_ROCKDIR"] = path.install_dir(depq.name, version_or_err, tree)
+         end
       else
          if depq.constraints and depq.constraints[1] and depq.constraints[1].no_upgrade then
             util.printerr("This version of "..name.." is designed for use with")
@@ -341,7 +344,7 @@ function deps.fulfill_dependencies(rockspec: Rockspec, depskey: DepsKey, deps_mo
             util.printerr("or look for a suitable version of "..name.." with")
             util.printerr("   luarocks search "..name)
          end
-         return nil, found_or_err
+         return nil, version_or_err
       end
    end
 
@@ -703,7 +706,7 @@ end
 
 local function lua_h_exists(d: string, luaver: string): boolean, string, string, integer
    local major, minor = luaver:match("(%d+)%.(%d+)")
-   local luanum = ("%s%02d"):format(major, tonumber(minor))
+   local luanum = ("%s%02d"):format(major, math.tointeger(minor))
 
    local lua_h = dir.path(d, "lua.h")
    local fd = io.open(lua_h)
@@ -749,7 +752,7 @@ local function find_lua_incdir(prefix: string, luaver: string, luajitver: string
 end
 
 function deps.check_lua_incdir(vars: {string: string}): boolean, string, string
-   if vars.LUA_INCDIR_OK == "ok" 
+   if vars.LUA_INCDIR_OK == "ok"
       then return true
    end
 
@@ -777,7 +780,7 @@ function deps.check_lua_incdir(vars: {string: string}): boolean, string, string
 end
 
 function deps.check_lua_libdir(vars: {string: string}): boolean, string, string, {string : {string}}
-   if vars.LUA_LIBDIR_OK == "ok" 
+   if vars.LUA_LIBDIR_OK == "ok"
       then return true
    end
 
@@ -814,7 +817,7 @@ function deps.check_lua_libdir(vars: {string: string}): boolean, string, string,
             -- if filename isn't versioned, check file contents
             local txt = fd:read("*a")
             ok = txt:find("Lua " .. cfg.lua_version, 1, true)
-                 or txt:find("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true) 
+                 or txt:find("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
                  and true
             if not ok then
                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."
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 41a9ba8b..2c99ff0d 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -145,13 +145,14 @@ function unix.is_actual_binary(filename)
    if not file then
       return true
    end
-   local first = file:read(2)
+   local first = file:read()
    file:close()
    if not first then
       util.warning("could not read "..filename)
       return true
    end
-   return first ~= "#!"
+   -- only create wrapper for lua scripts with `#!/usr/bin/env lua` or `#!/usr/bin/lua`
+   return first:match('^#!.*[ /]lua.*') == first
 end
 
 function unix.copy_binary(filename, dest)
diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua
index 6a9a376c..8a1a528e 100644
--- a/src/luarocks/rockspecs.lua
+++ b/src/luarocks/rockspecs.lua
@@ -83,6 +83,9 @@ local function configure_paths(rockspec)
    vars.CONFDIR = path.conf_dir(name, version)
    vars.BINDIR = path.bin_dir(name, version)
    vars.DOCDIR = path.doc_dir(name, version)
+   if rockspec:format_is_at_least("3.1") then
+      vars.LUA_VERSION = cfg.lua_version
+   end
    rockspec.variables = vars
 end
 
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl
index a34c0dbf..9f12649c 100644
--- a/src/luarocks/rockspecs.tl
+++ b/src/luarocks/rockspecs.tl
@@ -83,6 +83,9 @@ local function configure_paths(rockspec: Rockspec)
    vars.CONFDIR = path.conf_dir(name, version)
    vars.BINDIR = path.bin_dir(name, version)
    vars.DOCDIR = path.doc_dir(name, version)
+   if rockspec:format_is_at_least("3.1") then
+      vars.LUA_VERSION = cfg.lua_version
+   end
    rockspec.variables = vars
 end
 
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index 8dc188a6..d1575cb0 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -129,14 +129,13 @@ local function file_lines(f)
             end
          end
       end
-      local posi = math.tointeger(pos)
-      if not posi then
-         posi = #buffer
+      if not pos then
+         pos = #buffer
       elseif chars == '\r\n' then
-         posi = posi + 1
+         pos = pos + 1
       end
-      local line = buffer:sub(pos_beg, posi)
-      pos_beg = posi + 1
+      local line = buffer:sub(pos_beg, pos)
+      pos_beg = pos + 1
       if #line > 0 then
          return line
       end
diff --git a/src/luarocks/tools/patch.tl b/src/luarocks/tools/patch.tl
index 83c16ab7..553964e3 100644
--- a/src/luarocks/tools/patch.tl
+++ b/src/luarocks/tools/patch.tl
@@ -114,7 +114,7 @@ local function file_lines(f: FILE): function(): string
   local buffer = ""
   local pos_beg = 1
   return function(): string
-    local pos, chars: string, string
+    local pos, chars: integer, string
     while 1 do
       pos, chars = buffer:match('()([\r\n].)', pos_beg)
       if pos or not f then
@@ -129,14 +129,13 @@ local function file_lines(f: FILE): function(): string
         end
       end
     end
-    local posi = math.tointeger(pos)
-    if not posi then
-      posi = #buffer
+    if not pos then
+      pos = #buffer
     elseif chars == '\r\n' then
-      posi = posi + 1
+      pos = pos + 1
     end
-    local line = buffer:sub(pos_beg, posi)
-    pos_beg = posi + 1
+    local line = buffer:sub(pos_beg, pos)
+    pos_beg = pos + 1
     if #line > 0 then
       return line
     end
diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua
index cd4044f6..10b06690 100644
--- a/src/luarocks/type/rockspec.lua
+++ b/src/luarocks/type/rockspec.lua
@@ -11,7 +11,7 @@ local type_check = require("luarocks.type_check")
 
 
 
-type_rockspec.rockspec_format = "3.0"
+type_rockspec.rockspec_format = "3.1"
 
 
 
@@ -174,6 +174,9 @@ local rockspec_formats, versions = type_check.declare_schemas({
          },
       },
    },
+
+   ["3.1"] = {},
+
 })
 
 
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl
index 599c13ce..52ad7909 100644
--- a/src/luarocks/type/rockspec.tl
+++ b/src/luarocks/type/rockspec.tl
@@ -11,7 +11,7 @@ local type_check = require("luarocks.type_check")
 
 -- local type TableSchema = type_check.TableSchema
 
-type_rockspec.rockspec_format = "3.0"
+type_rockspec.rockspec_format = "3.1"
 
 -- Syntax for type-checking tables:
 --
@@ -173,7 +173,10 @@ local rockspec_formats, versions = type_check.declare_schemas({
             _more = true,
          },
       }
-   }
+   },
+
+   ["3.1"] = {},
+
 })
 
 -- type_rockspec.order = {"rockspec_format", "package", "version",