fix dynamic require workaround

4 files changed, 17 insertions, 200 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index bc674a1a..effc3f1b 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -1,17 +1,5 @@
 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 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 pcall = _tl_compat and _tl_compat.pcall or pcall; local string = _tl_compat and _tl_compat.string or string
-local build = {Op_b = {}, Builds = {}, }
-
-
-
-
-
-
-
-
-
-
-
-
+local build = {Builds = {}, }
 
 
 
@@ -47,8 +35,6 @@ local deplocks = require("luarocks.deplocks")
 
 
 
-
-
 do
 
 
@@ -243,38 +229,15 @@ local function run_build_driver(rockspec, no_install)
       btype = "builtin"
       rockspec.build.type = btype
    end
+   local driver
    if cfg.accepted_build_types and not fun.contains(cfg.accepted_build_types, btype) then
       return nil, "This rockspec uses the '" .. btype .. "' build type, which is blocked by the 'accepted_build_types' setting in your LuaRocks configuration."
    end
-   local pok, driver_str, driver
-   if btype == "builtin" then
-      pok, driver_str = pcall(require, "luarocks.build.builtin")
-      if not pok or not (type(driver_str) == "table") then
-         return nil, "Failed initializing build back-end for build type '" .. btype .. "': " .. driver_str
-      else
-         driver = driver_str
-      end
-   elseif btype == "cmake" then
-      pok, driver_str = pcall(require, "luarocks.build.cmake")
-      if not pok or not (type(driver_str) == "table") then
-         return nil, "Failed initializing build back-end for build type '" .. btype .. "': " .. driver_str
-      else
-         driver = driver_str
-      end
-   elseif btype == "make" then
-      pok, driver_str = pcall(require, "luarocks.build.make")
-      if not pok or not (type(driver_str) == "table") then
-         return nil, "Failed initializing build back-end for build type '" .. btype .. "': " .. driver_str
-      else
-         driver = driver_str
-      end
-   elseif btype == "command" then
-      pok, driver_str = pcall(require, "luarocks.build.command")
-      if not pok or not (type(driver_str) == "table") then
-         return nil, "Failed initializing build back-end for build type '" .. btype .. "': " .. driver_str
-      else
-         driver = driver_str
-      end
+   local pok, driver_str = pcall(require, "luarocks.build." .. btype)
+   if not (type(driver_str) == "table") then
+      return nil, "Failed initializing build back-end for build type '" .. btype .. "': " .. driver_str
+   else
+      driver = driver_str
    end
 
    if not driver.skip_lua_inc_lib_check then
@@ -413,7 +376,6 @@ end
 
 
 
-
 function build.build_rockspec(rockspec, opts, cwd)
 
    cwd = cwd or dir.path(".")
diff --git a/src/luarocks/build.tl b/src/luarocks/build.tl
index b11ceb80..38c2d826 100644
--- a/src/luarocks/build.tl
+++ b/src/luarocks/build.tl
@@ -229,38 +229,15 @@ local function run_build_driver(rockspec: Rockspec, no_install: boolean): boolea
       btype = "builtin"
       rockspec.build.type = btype
    end
+   local driver: Builds
    if cfg.accepted_build_types and not fun.contains(cfg.accepted_build_types, btype) then
       return nil, "This rockspec uses the '"..btype.."' build type, which is blocked by the 'accepted_build_types' setting in your LuaRocks configuration."
    end
-   local pok, driver_str, driver: boolean, Builds | string, Builds
-   if btype == "builtin" then
-      pok, driver_str = pcall(require, "luarocks.build.builtin") as (boolean, Builds | string)
-      if not pok or not driver_str is Builds then
-         return nil, "Failed initializing build back-end for build type '"..btype.."': "..driver_str as string
-      else
-         driver = driver_str as Builds
-      end
-   elseif btype == "cmake" then
-      pok, driver_str = pcall(require, "luarocks.build.cmake") as (boolean, Builds | string)
-      if not pok or not driver_str is Builds then
-         return nil, "Failed initializing build back-end for build type '"..btype.."': "..driver_str as string
-      else
-         driver = driver_str as Builds
-      end
-   elseif btype == "make" then
-      pok, driver_str = pcall(require, "luarocks.build.make") as (boolean, Builds | string)
-      if not pok or not driver_str is Builds then
-         return nil, "Failed initializing build back-end for build type '"..btype.."': "..driver_str as string
-      else
-         driver = driver_str as Builds
-      end
-   elseif btype == "command" then
-      pok, driver_str = pcall(require, "luarocks.build.command") as (boolean, Builds | string)
-      if not pok or not driver_str is Builds then
-         return nil, "Failed initializing build back-end for build type '"..btype.."': "..driver_str as string
-      else
-         driver = driver_str as Builds
-      end
+   local pok, driver_str = pcall(require, "luarocks.build." .. btype) as (boolean, Builds | string)
+   if not driver_str is Builds then
+      return nil, "Failed initializing build back-end for build type '"..btype.."': "..driver_str
+   else
+      driver = driver_str as Builds
    end
 
    if not driver.skip_lua_inc_lib_check then
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 2c6f7e28..fdc17d2c 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -19,7 +19,6 @@ local cfg = require("luarocks.core.cfg")
 
 
 
-
 local function ensure_trailing_slash(url)
    return (url:gsub("/*$", "/"))
 end
@@ -436,7 +435,6 @@ end
 
 
 function fetch.load_local_rockspec(rel_filename, quick)
-   assert(type(rel_filename) == "string")
    local abs_filename = fs.absolute_name(rel_filename)
 
    local basename = dir.base_name(abs_filename)
@@ -581,68 +579,8 @@ function fetch.fetch_sources(rockspec, extract, dest_dir)
    if dir.is_basic_protocol(protocol) then
       proto = fetch
    else
-      local protocolfilename = protocol:gsub("[+-]", "_")
-      if protocolfilename == "cvs" then
-         ok, proto = pcall(require, "luarocks.fetch.cvs")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "git_file" then
-         ok, proto = pcall(require, "luarocks.fetch.git_file")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "git_http" then
-         ok, proto = pcall(require, "luarocks.fetch.git_http")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "git_https" then
-         ok, proto = pcall(require, "luarocks.fetch.git_https")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "git_ssh" then
-         ok, proto = pcall(require, "luarocks.fetch.git_ssh")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "git" then
-         ok, proto = pcall(require, "luarocks.fetch.git")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "hg_http" then
-         ok, proto = pcall(require, "luarocks.fetch.hg_http")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "hg_https" then
-         ok, proto = pcall(require, "luarocks.fetch.hg_https")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "hg_ssh" then
-         ok, proto = pcall(require, "luarocks.fetch.hg_ssh")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "hg" then
-         ok, proto = pcall(require, "luarocks.fetch.hg")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "sscm" then
-         ok, proto = pcall(require, "luarocks.fetch.sscm")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      elseif protocolfilename == "svn" then
-         ok, proto = pcall(require, "luarocks.fetch.svn")
-         if not ok then
-            return nil, "Unknown protocol " .. protocol
-         end
-      else
+      ok, proto = pcall(require, "luarocks.fetch." .. protocol:gsub("[+-]", "_"))
+      if not ok then
          return nil, "Unknown protocol " .. protocol
       end
    end
diff --git a/src/luarocks/fetch.tl b/src/luarocks/fetch.tl
index 6ee1c616..b4927529 100644
--- a/src/luarocks/fetch.tl
+++ b/src/luarocks/fetch.tl
@@ -579,68 +579,8 @@ function fetch.fetch_sources(rockspec: Rockspec, extract: boolean, dest_dir?: st
    if dir.is_basic_protocol(protocol) then
       proto = fetch as Fetch
    else
-      local protocolfilename = protocol:gsub("[+-]", "_")
-      if protocolfilename == "cvs" then
-         ok, proto = pcall(require, "luarocks.fetch.cvs") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "git_file" then
-         ok, proto = pcall(require, "luarocks.fetch.git_file") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "git_http" then
-         ok, proto = pcall(require, "luarocks.fetch.git_http") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "git_https" then
-         ok, proto = pcall(require, "luarocks.fetch.git_https") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "git_ssh" then
-         ok, proto = pcall(require, "luarocks.fetch.git_ssh") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "git" then
-         ok, proto = pcall(require, "luarocks.fetch.git") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "hg_http" then
-         ok, proto = pcall(require, "luarocks.fetch.hg_http") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "hg_https" then
-         ok, proto = pcall(require, "luarocks.fetch.hg_https") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "hg_ssh" then
-         ok, proto = pcall(require, "luarocks.fetch.hg_ssh") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "hg" then
-         ok, proto = pcall(require, "luarocks.fetch.hg") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "sscm" then
-         ok, proto = pcall(require, "luarocks.fetch.sscm") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      elseif protocolfilename == "svn" then
-         ok, proto = pcall(require, "luarocks.fetch.svn") as (boolean, Fetch)
-         if not ok then
-            return nil, "Unknown protocol "..protocol
-         end
-      else
+      ok, proto = pcall(require, "luarocks.fetch."..protocol:gsub("[+-]", "_")) as (boolean, Fetch)
+      if not ok then
          return nil, "Unknown protocol "..protocol
       end
    end