build

15 files changed, 467 insertions, 318 deletions

diff --git a/src/luarocks/build.tl b/src/luarocks/build.tl
index 5494a84d..cbafb409 100644
--- a/src/luarocks/build.tl
+++ b/src/luarocks/build.tl
@@ -33,8 +33,8 @@ local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
 
 local type i = require("luarocks.core.types.installs")
-local type Installs = i.Installs
-local type Install = i.Install
+local type InstallDirs = i.InstallDirs
+local type InstallDir = i.InstallDir
 
 local type t = require("luarocks.core.types.tree")
 local type Tree = t.Tree
@@ -206,15 +206,15 @@ local function fetch_and_change_to_source_dir(rockspec: Rockspec, opts: Op_b): b
    return true
 end
 
-local function prepare_install_dirs(name: string, version: string): Installs, string
-   local dirs = {
+local function prepare_install_dirs(name: string, version: string): InstallDirs, string
+   local dirs: InstallDirs = {
       lua = { name = path.lua_dir(name, version), is_module_path = true, perms = "read" },
       lib = { name = path.lib_dir(name, version), is_module_path = true, perms = "exec" },
       bin = { name = path.bin_dir(name, version), is_module_path = false, perms = "exec" },
       conf = { name = path.conf_dir(name, version), is_module_path = false, perms = "read" },
    }
 
-   for _, d in pairs(dirs as {string: Install}) do
+   for _, d in pairs(dirs as {string: InstallDir}) do
       local ok, err = fs.make_dir(d.name)
       if not ok then
          return nil, err
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 14d13eb4..3d00a176 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -1,13 +1,25 @@
+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 os = _tl_compat and _tl_compat.os or os; local package = _tl_compat and _tl_compat.package or package; 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 _tl_table_unpack = unpack or table.unpack
 
---- A builtin build system: back-end to provide a portable way of building C-based Lua modules.
 local builtin = {}
 
--- This build driver checks LUA_INCDIR and LUA_LIBDIR on demand,
--- so that pure-Lua rocks don't need to have development headers
--- installed.
+
+
+
+
+
+
+local InstallDirs = i.InstallDirs
+
+
+
+
+
+
+
+
+
 builtin.skip_lua_inc_lib_check = true
 
-local unpack = unpack or table.unpack
 local dir_sep = package.config:sub(1, 1)
 
 local fs = require("luarocks.fs")
@@ -57,7 +69,7 @@ do
       local copy_directories
 
       local prefix = ""
-      for _, parent in ipairs({"src", "lua", "lib"}) do
+      for _, parent in ipairs({ "src", "lua", "lib" }) do
          if fs.is_dir(parent) then
             fs.change_dir(parent)
             prefix = parent .. dir_sep
@@ -74,9 +86,9 @@ do
             else
                local cmod = file:match("(.*)%.c$")
                if cmod then
-                  local modname = get_cmod_name(file) or path.path_to_module(file:gsub("%.c$", ".lua"))
+                  local modname = get_cmod_name(file) or path.path_to_module((file:gsub("%.c$", ".lua")))
                   modules[modname] = {
-                     sources = prefix..file,
+                     sources = prefix .. file,
                      libraries = libs,
                      incdirs = incdirs,
                      libdirs = libdirs,
@@ -90,8 +102,8 @@ do
          fs.pop_dir()
       end
 
-      local bindir = (fs.is_dir(dir.path("src", "bin")) and dir.path("src", "bin"))
-                  or (fs.is_dir("bin") and "bin")
+      local bindir = (fs.is_dir(dir.path("src", "bin")) and dir.path("src", "bin")) or
+      (fs.is_dir("bin") and "bin")
       if bindir then
          install = { bin = {} }
          for _, file in ipairs(fs.list_dir(bindir)) do
@@ -112,33 +124,34 @@ do
    end
 end
 
---- Run a command displaying its execution on standard output.
--- @return boolean: true if command succeeds (status code 0), false
--- otherwise.
+
+
+
 local function execute(...)
-   io.stdout:write(table.concat({...}, " ").."\n")
+   io.stdout:write(table.concat({ ... }, " ") .. "\n")
    return fs.execute(...)
 end
 
---- Driver function for the builtin build back-end.
--- @param rockspec table: the loaded rockspec.
--- @return boolean or (nil, string): true if no errors occurred,
--- nil and an error message otherwise.
+
+
+
+
 function builtin.run(rockspec, no_install)
-   assert(rockspec:type() == "rockspec")
-   local compile_object, compile_library, compile_static_library
+   local compile_object
+   local compile_library
+   local compile_static_library
 
    local build = rockspec.build
    local variables = rockspec.variables
    local checked_lua_h = false
 
-   for _, var in ipairs{ "CC", "CFLAGS", "LDFLAGS" } do
+   for _, var in ipairs({ "CC", "CFLAGS", "LDFLAGS" }) do
       variables[var] = variables[var] or os.getenv(var) or ""
    end
 
    local function add_flags(extras, flag, flags)
       if flags then
-         if type(flags) ~= "table" then
+         if not (type(flags) == "table") then
             flags = { tostring(flags) }
          end
          util.variable_substitutions(flags, variables)
@@ -153,43 +166,43 @@ function builtin.run(rockspec, no_install)
          local extras = {}
          add_flags(extras, "-D%s", defines)
          add_flags(extras, "-I%s", incdirs)
-         return execute(variables.CC.." "..variables.CFLAGS, "-c", "-o", object, "-I"..variables.LUA_INCDIR, source, unpack(extras))
+         return execute(variables.CC .. " " .. variables.CFLAGS, "-c", "-o", object, "-I" .. variables.LUA_INCDIR, source, _tl_table_unpack(extras))
       end
       compile_library = function(library, objects, libraries, libdirs, name)
-         local extras = { unpack(objects) }
+         local extras = { _tl_table_unpack(objects) }
          add_flags(extras, "-L%s", libdirs)
          add_flags(extras, "-l%s", libraries)
-         extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB)
+         extras[#extras + 1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB)
 
          if variables.CC == "clang" or variables.CC == "clang-cl" then
             local exported_name = name:gsub("%.", "_")
             exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
-            extras[#extras+1] = string.format("-Wl,-export:luaopen_%s", exported_name)
+            extras[#extras + 1] = string.format("-Wl,-export:luaopen_%s", exported_name)
          else
-            extras[#extras+1] = "-l" .. (variables.MSVCRT or "m")
+            extras[#extras + 1] = "-l" .. (variables.MSVCRT or "m")
          end
 
-         local ok = execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras))
-         return ok
-      end
-      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
-      compile_static_library = function(library, objects, libraries, libdirs, name)
-         local ok = execute(variables.AR, "rc", library, unpack(objects))
-         if ok then
-            ok = execute(variables.RANLIB, library)
-         end
+         local ok = execute(variables.LD .. " " .. variables.LDFLAGS .. " " .. variables.LIBFLAG, "-o", library, _tl_table_unpack(extras))
          return ok
       end
-      ]]
+
+
+
+
+
+
+
+
+
    elseif cfg.is_platform("win32") then
       compile_object = function(object, source, defines, incdirs)
          local extras = {}
          add_flags(extras, "-D%s", defines)
          add_flags(extras, "-I%s", incdirs)
-         return execute(variables.CC.." "..variables.CFLAGS, "-c", "-Fo"..object, "-I"..variables.LUA_INCDIR, source, unpack(extras))
+         return execute(variables.CC .. " " .. variables.CFLAGS, "-c", "-Fo" .. object, "-I" .. variables.LUA_INCDIR, source, _tl_table_unpack(extras))
       end
       compile_library = function(library, objects, libraries, libdirs, name)
-         local extras = { unpack(objects) }
+         local extras = { _tl_table_unpack(objects) }
          add_flags(extras, "-libpath:%s", libdirs)
          add_flags(extras, "%s.lib", libraries)
          local basename = dir.base_name(library):gsub(".[^.]*$", "")
@@ -198,49 +211,49 @@ function builtin.run(rockspec, no_install)
          local exported_name = name:gsub("%.", "_")
          exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
          def:write("EXPORTS\n")
-         def:write("luaopen_"..exported_name.."\n")
+         def:write("luaopen_" .. exported_name .. "\n")
          def:close()
-         local ok = execute(variables.LD, "-dll", "-def:"..deffile, "-out:"..library, dir.path(variables.LUA_LIBDIR, variables.LUALIB), unpack(extras))
+         local ok = execute(variables.LD, "-dll", "-def:" .. deffile, "-out:" .. library, dir.path(variables.LUA_LIBDIR, variables.LUALIB), _tl_table_unpack(extras))
          local basedir = ""
          if name:find("%.") ~= nil then
             basedir = name:gsub("%.%w+$", "\\")
             basedir = basedir:gsub("%.", "\\")
          end
-         local manifestfile = basedir .. basename..".dll.manifest"
+         local manifestfile = basedir .. basename .. ".dll.manifest"
 
          if ok and fs.exists(manifestfile) then
-            ok = execute(variables.MT, "-manifest", manifestfile, "-outputresource:"..basedir..basename..".dll;2")
+            ok = execute(variables.MT, "-manifest", manifestfile, "-outputresource:" .. basedir .. basename .. ".dll;2")
          end
          return ok
       end
-      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
-      compile_static_library = function(library, objects, libraries, libdirs, name)
-         local ok = execute(variables.AR, "-out:"..library, unpack(objects))
-         return ok
-      end
-      ]]
+
+
+
+
+
+
    else
       compile_object = function(object, source, defines, incdirs)
          local extras = {}
          add_flags(extras, "-D%s", defines)
          add_flags(extras, "-I%s", incdirs)
-         return execute(variables.CC.." "..variables.CFLAGS, "-I"..variables.LUA_INCDIR, "-c", source, "-o", object, unpack(extras))
+         return execute(variables.CC .. " " .. variables.CFLAGS, "-I" .. variables.LUA_INCDIR, "-c", source, "-o", object, _tl_table_unpack(extras))
       end
-      compile_library = function (library, objects, libraries, libdirs)
-         local extras = { unpack(objects) }
+      compile_library = function(library, objects, libraries, libdirs)
+         local extras = { _tl_table_unpack(objects) }
          add_flags(extras, "-L%s", libdirs)
          if cfg.gcc_rpath then
             add_flags(extras, "-Wl,-rpath,%s", libdirs)
          end
          add_flags(extras, "-l%s", libraries)
          if cfg.link_lua_explicitly then
-            extras[#extras+1] = "-L"..variables.LUA_LIBDIR
-            extras[#extras+1] = "-llua"
+            extras[#extras + 1] = "-L" .. variables.LUA_LIBDIR
+            extras[#extras + 1] = "-llua"
          end
-         return execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras))
+         return execute(variables.LD .. " " .. variables.LDFLAGS .. " " .. variables.LIBFLAG, "-o", library, _tl_table_unpack(extras))
       end
-      compile_static_library = function(library, objects, libraries, libdirs, name)  -- luacheck: ignore 211
-         local ok = execute(variables.AR, "rc", library, unpack(objects))
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "rc", library, _tl_table_unpack(objects))
          if ok then
             ok = execute(variables.RANLIB, library)
          end
@@ -285,15 +298,15 @@ function builtin.run(rockspec, no_install)
          if ext == "lua" then
             local filename = dir.base_name(info)
             if filename == "init.lua" and not name:match("%.init$") then
-               moddir = path.module_to_path(name..".init")
+               moddir = path.module_to_path(name .. ".init")
             else
                local basename = name:match("([^.]+)$")
-               filename = basename..".lua"
+               filename = basename .. ".lua"
             end
             local dest = dir.path(luadir, moddir, filename)
             lua_modules[info] = dest
          else
-            info = {info}
+            info = { info }
          end
       end
       if type(info) == "table" then
@@ -314,21 +327,21 @@ function builtin.run(rockspec, no_install)
          local objects = {}
          local sources = info.sources
          if info[1] then sources = info end
-         if type(sources) == "string" then sources = {sources} end
-         if type(sources) ~= "table" then
+         if type(sources) == "string" then sources = { sources } end
+         if not (type(sources) == "table") then
             return nil, "error in rockspec: module '" .. name .. "' entry has no 'sources' list"
          end
          for _, source in ipairs(sources) do
-            if type(source) ~= "string" then
+            if not (type(source) == "string") then
                return nil, "error in rockspec: module '" .. name .. "' does not specify source correctly."
             end
-            local object = source:gsub("%.[^.]*$", "."..cfg.obj_extension)
+            local object = source:gsub("%.[^.]*$", "." .. cfg.obj_extension)
             if not object then
-               object = source.."."..cfg.obj_extension
+               object = source .. "." .. cfg.obj_extension
             end
             ok = compile_object(object, source, info.defines, info.incdirs or autoincdirs)
             if not ok then
-               return nil, "Failed compiling object "..object
+               return nil, "Failed compiling object " .. object
             end
             table.insert(objects, object)
          end
@@ -338,7 +351,7 @@ function builtin.run(rockspec, no_install)
             util.schedule_function(fs.delete, compile_temp_dir)
          end
 
-         local module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.lib_extension)
+         local module_name = name:match("([^.]*)$") .. "." .. util.matchquote(cfg.lib_extension)
          if moddir ~= "" then
             module_name = dir.path(moddir, module_name)
          end
@@ -350,46 +363,46 @@ function builtin.run(rockspec, no_install)
          lib_modules[build_name] = dir.path(libdir, module_name)
          ok = compile_library(build_name, objects, info.libraries, info.libdirs or autolibdirs, name)
          if not ok then
-            return nil, "Failed compiling module "..module_name
+            return nil, "Failed compiling module " .. module_name
          end
 
-         -- for backwards compatibility, try keeping a copy of the module
-         -- in the old location (luasec-1.3.2-1 rockspec breaks otherwise)
+
+
          if cached_make_dir(dir.dir_name(module_name)) then
             fs.copy(build_name, module_name)
          end
 
-         --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
-         module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.static_lib_extension)
-         if moddir ~= "" then
-            module_name = dir.path(moddir, module_name)
-         end
-         lib_modules[module_name] = dir.path(libdir, module_name)
-         ok = compile_static_library(module_name, objects, info.libraries, info.libdirs, name)
-         if not ok then
-            return nil, "Failed compiling static library "..module_name
-         end
-         ]]
+
+
+
+
+
+
+
+
+
+
+
       end
    end
    if not no_install then
-      for _, mods in ipairs({{ tbl = lua_modules, perms = "read" }, { tbl = lib_modules, perms = "exec" }}) do
+      for _, mods in ipairs({ { tbl = lua_modules, perms = "read" }, { tbl = lib_modules, perms = "exec" } }) do
          for name, dest in pairs(mods.tbl) do
             cached_make_dir(dir.dir_name(dest))
             ok, err = fs.copy(name, dest, mods.perms)
             if not ok then
-               return nil, "Failed installing "..name.." in "..dest..": "..err
+               return nil, "Failed installing " .. name .. " in " .. dest .. ": " .. err
             end
          end
       end
       if fs.is_dir("lua") then
          ok, err = fs.copy_contents("lua", luadir)
          if not ok then
-            return nil, "Failed copying contents of 'lua' directory: "..err
+            return nil, "Failed copying contents of 'lua' directory: " .. err
          end
       end
    end
    return true
 end
 
-return builtin
\ No newline at end of file
+return builtin
diff --git a/src/luarocks/build/builtin.tl b/src/luarocks/build/builtin.tl
index 2ab688dc..d052edf6 100644
--- a/src/luarocks/build/builtin.tl
+++ b/src/luarocks/build/builtin.tl
@@ -8,10 +8,11 @@ local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
 
 local type i = require("luarocks.core.types.installs")
-local type Installs = i.Installs
+local type InstallDirs = i.InstallDirs
 
 local type b = require("luarocks.core.types.build")
 local type BuiltinBuild = b.BuiltinBuild
+local type Build = b.Build
 local type Module = BuiltinBuild.Module
 
 -- This build driver checks LUA_INCDIR and LUA_LIBDIR on demand,
@@ -54,7 +55,7 @@ do
       return (data:match("int%s+luaopen_([a-zA-Z0-9_]+)"))
    end
 
-   local skiplist = {
+   local skiplist: {string: boolean} = {
       ["spec"] = true,
       [".luarocks"] = true,
       ["lua_modules"] = true,
@@ -62,9 +63,9 @@ do
       ["tests.lua"] = true,
    }
 
-   function builtin.autodetect_modules(libs: {string}, incdirs: {string}, libdirs: {string}):  {string : string | Module}, Installs, {string}
+   function builtin.autodetect_modules(libs: {string}, incdirs: {string}, libdirs: {string}):  {string : string | Module}, BuiltinBuild.Install, {string}
       local modules: {string: (string | Module)} = {}
-      local install: Installs
+      local install: BuiltinBuild.Install
       local copy_directories: {string}
 
       local prefix = ""
@@ -78,14 +79,14 @@ do
 
       for _, file in ipairs(fs.find()) do
          local base = file:match("^([^\\/]*)")
-         if not (skiplist as {string: boolean})[base] then
+         if not skiplist[base] then
             local luamod = file:match("(.*)%.lua$")
             if luamod then
                modules[path.path_to_module(file)] = prefix .. file
             else
                local cmod = file:match("(.*)%.c$")
                if cmod then
-                  local modname = get_cmod_name(file) or path.path_to_module((file:gsub("%.c$", ".lua"))) --!
+                  local modname = get_cmod_name(file) or path.path_to_module((file:gsub("%.c$", ".lua")))
                   modules[modname] = {
                      sources = prefix..file,
                      libraries = libs,
@@ -270,7 +271,7 @@ function builtin.run(rockspec: Rockspec, no_install: boolean): boolean, string,
 
    if not build.modules then
       if rockspec:format_is_at_least("3.0") then
-         local install, copy_directories: Installs, {string}
+         local install, copy_directories: Build.Install, {string}
          build.modules, install, copy_directories = builtin.autodetect_modules(autolibs, autoincdirs, autolibdirs)
          build.install = build.install or install
          build.copy_directories = build.copy_directories or copy_directories
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index b7a4786e..ea245444 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -1,24 +1,30 @@
+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 os = _tl_compat and _tl_compat.os or os; local pairs = _tl_compat and _tl_compat.pairs or pairs
 
---- Build back-end for CMake-based modules.
 local cmake = {}
 
+
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
---- Driver function for the "cmake" build back-end.
--- @param rockspec table: the loaded rockspec.
--- @return boolean or (nil, string): true if no errors occurred,
--- nil and an error message otherwise.
+
+
+
+
+
+
+
+
+
+
 function cmake.run(rockspec, no_install)
-   assert(rockspec:type() == "rockspec")
    local build = rockspec.build
    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")
+
+   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)
 
@@ -27,34 +33,35 @@ function cmake.run(rockspec, no_install)
       return nil, err_msg
    end
 
-   -- If inline cmake is present create CMakeLists.txt from it.
-   if type(build.cmake) == "string" then
-      local cmake_handler = assert(io.open(fs.current_dir().."/CMakeLists.txt", "w"))
+
+   local build_cmake = build.cmake
+   if type(build_cmake) == "string" then
+      local cmake_handler = assert((io.open(fs.current_dir() .. "/CMakeLists.txt", "w")))
       cmake_handler:write(build.cmake)
       cmake_handler:close()
    end
 
-   -- Execute cmake with variables.
+
    local args = ""
 
-   -- Try to pick the best generator. With msvc and x64, CMake does not select it by default so we need to be explicit.
+
    if cfg.cmake_generator then
-      args = args .. ' -G"'..cfg.cmake_generator.. '"'
+      args = args .. ' -G"' .. cfg.cmake_generator .. '"'
    elseif cfg.is_platform("windows") and cfg.target_cpu:match("x86_64$") then
       args = args .. " -DCMAKE_GENERATOR_PLATFORM=x64"
    end
 
-   for k,v in pairs(variables) do
-      args = args .. ' -D' ..k.. '="' ..tostring(v).. '"'
+   for k, v in pairs(variables) do
+      args = args .. ' -D' .. k .. '="' .. tostring(v) .. '"'
    end
 
-   if not fs.execute_string(rockspec.variables.CMAKE.." -H. -Bbuild.luarocks "..args) then
+   if not fs.execute_string(rockspec.variables.CMAKE .. " -H. -Bbuild.luarocks " .. args) then
       return nil, "Failed cmake."
    end
 
    local do_build, do_install
    if rockspec:format_is_at_least("3.0") then
-      do_build   = (build.build_pass   == nil) and true or build.build_pass
+      do_build = (build.build_pass == nil) and true or build.build_pass
       do_install = (build.install_pass == nil) and true or build.install_pass
    else
       do_build = true
@@ -62,12 +69,12 @@ function cmake.run(rockspec, no_install)
    end
 
    if do_build then
-      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --config Release") then
+      if not fs.execute_string(rockspec.variables.CMAKE .. " --build build.luarocks --config Release") then
          return nil, "Failed building."
       end
    end
    if do_install and not no_install then
-      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --target install --config Release") then
+      if not fs.execute_string(rockspec.variables.CMAKE .. " --build build.luarocks --target install --config Release") then
          return nil, "Failed installing."
       end
    end
diff --git a/src/luarocks/build/cmake.tl b/src/luarocks/build/cmake.tl
index b0307b08..1c00797f 100644
--- a/src/luarocks/build/cmake.tl
+++ b/src/luarocks/build/cmake.tl
@@ -1,6 +1,7 @@
 
 --- Build back-end for CMake-based modules.
-local cmake = {}
+local record cmake
+end
 
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
@@ -9,9 +10,6 @@ local cfg = require("luarocks.core.cfg")
 local type r = require("luarocks.core.types.rockspec")
 local type Rockspec = r.Rockspec
 
-local type i = require("luarocks.core.types.installs")
-local type Installs = i.Installs
-
 local type b = require("luarocks.core.types.build")
 local type CMakeBuild = b.CMakeBuild
 
diff --git a/src/luarocks/build/command.lua b/src/luarocks/build/command.lua
index b0c4aa79..181bc56b 100644
--- a/src/luarocks/build/command.lua
+++ b/src/luarocks/build/command.lua
@@ -1,17 +1,23 @@
 
---- Build back-end for raw listing of commands in rockspec files.
+
 local command = {}
 
+
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
---- Driver function for the "command" build back-end.
--- @param rockspec table: the loaded rockspec.
--- @return boolean or (nil, string): true if no errors occurred,
--- nil and an error message otherwise.
+
+
+
+
+
+
+
+
+
+
 function command.run(rockspec, not_install)
-   assert(rockspec:type() == "rockspec")
 
    local build = rockspec.build
 
@@ -19,8 +25,8 @@ function command.run(rockspec, not_install)
 
    local env = {
       CC = cfg.variables.CC,
-      --LD = cfg.variables.LD,
-      --CFLAGS = cfg.variables.CFLAGS,
+
+
    }
 
    if build.build_command then
diff --git a/src/luarocks/build/command.tl b/src/luarocks/build/command.tl
index b0c4aa79..c2739987 100644
--- a/src/luarocks/build/command.tl
+++ b/src/luarocks/build/command.tl
@@ -1,23 +1,29 @@
 
 --- Build back-end for raw listing of commands in rockspec files.
-local command = {}
+local record command
+end
 
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+
+local type b = require("luarocks.core.types.build")
+local type CommandBuild = b.CommandBuild
+
 --- Driver function for the "command" build back-end.
 -- @param rockspec table: the loaded rockspec.
 -- @return boolean or (nil, string): true if no errors occurred,
 -- nil and an error message otherwise.
-function command.run(rockspec, not_install)
-   assert(rockspec:type() == "rockspec")
+function command.run(rockspec: Rockspec, not_install: boolean): boolean, string, string
 
-   local build = rockspec.build
+   local build = rockspec.build as CommandBuild
 
-   util.variable_substitutions(build, rockspec.variables)
+   util.variable_substitutions(build as {string: string}, rockspec.variables)
 
-   local env = {
+   local env: {string: string} = {
       CC = cfg.variables.CC,
       --LD = cfg.variables.LD,
       --CFLAGS = cfg.variables.CFLAGS,
diff --git a/src/luarocks/build/make.tl b/src/luarocks/build/make.tl
index 4345ddff..58fc6e2e 100644
--- a/src/luarocks/build/make.tl
+++ b/src/luarocks/build/make.tl
@@ -1,13 +1,18 @@
 
 --- Build back-end for using Makefile-based packages.
-local make = {}
-
-local unpack = unpack or table.unpack
+local record make
+end
 
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
+local type r = require("luarocks.core.types.rockspec")
+local type Rockspec = r.Rockspec
+
+local type b = require("luarocks.core.types.build")
+local type MakeBuild = b.MakeBuild
+
 --- Call "make" with given target and variables
 -- @param make_cmd string: the make command to be used (typically
 -- configured through variables.MAKE in the config files, or
@@ -18,17 +23,13 @@ local cfg = require("luarocks.core.cfg")
 -- @param variables table: A table containing string-string key-value
 -- pairs representing variable assignments to be passed to make.
 -- @return boolean: false if any errors occurred, true otherwise.
-local function make_pass(make_cmd, pass, target, variables)
-   assert(type(pass) == "boolean")
-   assert(type(target) == "string")
-   assert(type(variables) == "table")
-
-   local assignments = {}
+local function make_pass(make_cmd: string, pass: boolean, target: string, variables: {string: string}): boolean, string, string
+   local assignments: {string} = {}
    for k,v in pairs(variables) do
       table.insert(assignments, k.."="..v)
    end
    if pass then
-      return fs.execute(make_cmd.." "..target, unpack(assignments))
+      return fs.execute(make_cmd.." "..target, table.unpack(assignments))
    else
       return true
    end
@@ -38,10 +39,9 @@ end
 -- @param rockspec table: the loaded rockspec.
 -- @return boolean or (nil, string): true if no errors occurred,
 -- nil and an error message otherwise.
-function make.run(rockspec, not_install)
-   assert(rockspec:type() == "rockspec")
+function make.run(rockspec: Rockspec, not_install: boolean): boolean, string, string
 
-   local build = rockspec.build
+   local build = rockspec.build as MakeBuild
 
    if build.build_pass == nil then build.build_pass = true end
    if build.install_pass == nil then build.install_pass = true end
@@ -64,13 +64,13 @@ function make.run(rockspec, not_install)
    end
 
    util.warn_if_not_used(build.build_variables, { CFLAGS=true }, "variable %s was not passed in build_variables")
-
+--  Here, `util.warn_if_not_used(build.build_variables, { CFLAGS=true }, "variable %s was not passed in build_variables")` isn't the type of  `build.build_variables`, `{string: string}`, like `variables`
    util.variable_substitutions(build.build_variables, rockspec.variables)
    util.variable_substitutions(build.install_variables, rockspec.variables)
 
    local auto_variables = { "CC" }
 
-   for _, variable in pairs(auto_variables) do
+   for _, variable in ipairs(auto_variables) do
       if not build.build_variables[variable] then
          build.build_variables[variable] = rockspec.variables[variable]
       end
diff --git a/src/luarocks/build/builtin-incomplete.lua b/src/luarocks/build/originals/builtin-original.lua
index 76b50d9f..14d13eb4 100644
--- a/src/luarocks/build/builtin-incomplete.lua
+++ b/src/luarocks/build/originals/builtin-original.lua
@@ -1,24 +1,13 @@
-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 os = _tl_compat and _tl_compat.os or os; local package = _tl_compat and _tl_compat.package or package; 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 _tl_table_unpack = unpack or table.unpack
 
+--- A builtin build system: back-end to provide a portable way of building C-based Lua modules.
 local builtin = {}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+-- This build driver checks LUA_INCDIR and LUA_LIBDIR on demand,
+-- so that pure-Lua rocks don't need to have development headers
+-- installed.
 builtin.skip_lua_inc_lib_check = true
 
+local unpack = unpack or table.unpack
 local dir_sep = package.config:sub(1, 1)
 
 local fs = require("luarocks.fs")
@@ -68,7 +57,7 @@ do
       local copy_directories
 
       local prefix = ""
-      for _, parent in ipairs({ "src", "lua", "lib" }) do
+      for _, parent in ipairs({"src", "lua", "lib"}) do
          if fs.is_dir(parent) then
             fs.change_dir(parent)
             prefix = parent .. dir_sep
@@ -78,16 +67,16 @@ do
 
       for _, file in ipairs(fs.find()) do
          local base = file:match("^([^\\/]*)")
-         if not (skiplist)[base] then
+         if not skiplist[base] then
             local luamod = file:match("(.*)%.lua$")
             if luamod then
                modules[path.path_to_module(file)] = prefix .. file
             else
                local cmod = file:match("(.*)%.c$")
                if cmod then
-                  local modname = get_cmod_name(file) or path.path_to_module((file:gsub("%.c$", ".lua")))
+                  local modname = get_cmod_name(file) or path.path_to_module(file:gsub("%.c$", ".lua"))
                   modules[modname] = {
-                     sources = prefix .. file,
+                     sources = prefix..file,
                      libraries = libs,
                      incdirs = incdirs,
                      libdirs = libdirs,
@@ -101,8 +90,8 @@ do
          fs.pop_dir()
       end
 
-      local bindir = (fs.is_dir(dir.path("src", "bin")) and dir.path("src", "bin")) or
-      (fs.is_dir("bin") and "bin")
+      local bindir = (fs.is_dir(dir.path("src", "bin")) and dir.path("src", "bin"))
+                  or (fs.is_dir("bin") and "bin")
       if bindir then
          install = { bin = {} }
          for _, file in ipairs(fs.list_dir(bindir)) do
@@ -123,34 +112,33 @@ do
    end
 end
 
-
-
-
+--- Run a command displaying its execution on standard output.
+-- @return boolean: true if command succeeds (status code 0), false
+-- otherwise.
 local function execute(...)
-   io.stdout:write(table.concat({ ... }, " ") .. "\n")
+   io.stdout:write(table.concat({...}, " ").."\n")
    return fs.execute(...)
 end
 
-
-
-
-
+--- Driver function for the builtin build back-end.
+-- @param rockspec table: the loaded rockspec.
+-- @return boolean or (nil, string): true if no errors occurred,
+-- nil and an error message otherwise.
 function builtin.run(rockspec, no_install)
-   local compile_object
-   local compile_library
-   local compile_static_library
+   assert(rockspec:type() == "rockspec")
+   local compile_object, compile_library, compile_static_library
 
    local build = rockspec.build
    local variables = rockspec.variables
    local checked_lua_h = false
 
-   for _, var in ipairs({ "CC", "CFLAGS", "LDFLAGS" }) do
+   for _, var in ipairs{ "CC", "CFLAGS", "LDFLAGS" } do
       variables[var] = variables[var] or os.getenv(var) or ""
    end
 
    local function add_flags(extras, flag, flags)
       if flags then
-         if not (type(flags) == "table") then
+         if type(flags) ~= "table" then
             flags = { tostring(flags) }
          end
          util.variable_substitutions(flags, variables)
@@ -165,43 +153,43 @@ function builtin.run(rockspec, no_install)
          local extras = {}
          add_flags(extras, "-D%s", defines)
          add_flags(extras, "-I%s", incdirs)
-         return execute(variables.CC .. " " .. variables.CFLAGS, "-c", "-o", object, "-I" .. variables.LUA_INCDIR, source, _tl_table_unpack(extras))
+         return execute(variables.CC.." "..variables.CFLAGS, "-c", "-o", object, "-I"..variables.LUA_INCDIR, source, unpack(extras))
       end
       compile_library = function(library, objects, libraries, libdirs, name)
-         local extras = { _tl_table_unpack(objects) }
+         local extras = { unpack(objects) }
          add_flags(extras, "-L%s", libdirs)
          add_flags(extras, "-l%s", libraries)
-         extras[#extras + 1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB)
+         extras[#extras+1] = dir.path(variables.LUA_LIBDIR, variables.LUALIB)
 
          if variables.CC == "clang" or variables.CC == "clang-cl" then
             local exported_name = name:gsub("%.", "_")
             exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
-            extras[#extras + 1] = string.format("-Wl,-export:luaopen_%s", exported_name)
+            extras[#extras+1] = string.format("-Wl,-export:luaopen_%s", exported_name)
          else
-            extras[#extras + 1] = "-l" .. (variables.MSVCRT or "m")
+            extras[#extras+1] = "-l" .. (variables.MSVCRT or "m")
          end
 
-         local ok = execute(variables.LD .. " " .. variables.LDFLAGS .. " " .. variables.LIBFLAG, "-o", library, _tl_table_unpack(extras))
+         local ok = execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras))
          return ok
       end
-
-
-
-
-
-
-
-
-
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "rc", library, unpack(objects))
+         if ok then
+            ok = execute(variables.RANLIB, library)
+         end
+         return ok
+      end
+      ]]
    elseif cfg.is_platform("win32") then
       compile_object = function(object, source, defines, incdirs)
          local extras = {}
          add_flags(extras, "-D%s", defines)
          add_flags(extras, "-I%s", incdirs)
-         return execute(variables.CC .. " " .. variables.CFLAGS, "-c", "-Fo" .. object, "-I" .. variables.LUA_INCDIR, source, _tl_table_unpack(extras))
+         return execute(variables.CC.." "..variables.CFLAGS, "-c", "-Fo"..object, "-I"..variables.LUA_INCDIR, source, unpack(extras))
       end
       compile_library = function(library, objects, libraries, libdirs, name)
-         local extras = { _tl_table_unpack(objects) }
+         local extras = { unpack(objects) }
          add_flags(extras, "-libpath:%s", libdirs)
          add_flags(extras, "%s.lib", libraries)
          local basename = dir.base_name(library):gsub(".[^.]*$", "")
@@ -210,49 +198,49 @@ function builtin.run(rockspec, no_install)
          local exported_name = name:gsub("%.", "_")
          exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
          def:write("EXPORTS\n")
-         def:write("luaopen_" .. exported_name .. "\n")
+         def:write("luaopen_"..exported_name.."\n")
          def:close()
-         local ok = execute(variables.LD, "-dll", "-def:" .. deffile, "-out:" .. library, dir.path(variables.LUA_LIBDIR, variables.LUALIB), _tl_table_unpack(extras))
+         local ok = execute(variables.LD, "-dll", "-def:"..deffile, "-out:"..library, dir.path(variables.LUA_LIBDIR, variables.LUALIB), unpack(extras))
          local basedir = ""
          if name:find("%.") ~= nil then
             basedir = name:gsub("%.%w+$", "\\")
             basedir = basedir:gsub("%.", "\\")
          end
-         local manifestfile = basedir .. basename .. ".dll.manifest"
+         local manifestfile = basedir .. basename..".dll.manifest"
 
          if ok and fs.exists(manifestfile) then
-            ok = execute(variables.MT, "-manifest", manifestfile, "-outputresource:" .. basedir .. basename .. ".dll;2")
+            ok = execute(variables.MT, "-manifest", manifestfile, "-outputresource:"..basedir..basename..".dll;2")
          end
          return ok
       end
-
-
-
-
-
-
+      --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "-out:"..library, unpack(objects))
+         return ok
+      end
+      ]]
    else
       compile_object = function(object, source, defines, incdirs)
          local extras = {}
          add_flags(extras, "-D%s", defines)
          add_flags(extras, "-I%s", incdirs)
-         return execute(variables.CC .. " " .. variables.CFLAGS, "-I" .. variables.LUA_INCDIR, "-c", source, "-o", object, _tl_table_unpack(extras))
+         return execute(variables.CC.." "..variables.CFLAGS, "-I"..variables.LUA_INCDIR, "-c", source, "-o", object, unpack(extras))
       end
-      compile_library = function(library, objects, libraries, libdirs)
-         local extras = { _tl_table_unpack(objects) }
+      compile_library = function (library, objects, libraries, libdirs)
+         local extras = { unpack(objects) }
          add_flags(extras, "-L%s", libdirs)
          if cfg.gcc_rpath then
             add_flags(extras, "-Wl,-rpath,%s", libdirs)
          end
          add_flags(extras, "-l%s", libraries)
          if cfg.link_lua_explicitly then
-            extras[#extras + 1] = "-L" .. variables.LUA_LIBDIR
-            extras[#extras + 1] = "-llua"
+            extras[#extras+1] = "-L"..variables.LUA_LIBDIR
+            extras[#extras+1] = "-llua"
          end
-         return execute(variables.LD .. " " .. variables.LDFLAGS .. " " .. variables.LIBFLAG, "-o", library, _tl_table_unpack(extras))
+         return execute(variables.LD.." "..variables.LDFLAGS.." "..variables.LIBFLAG, "-o", library, unpack(extras))
       end
-      compile_static_library = function(library, objects, libraries, libdirs, name)
-         local ok = execute(variables.AR, "rc", library, _tl_table_unpack(objects))
+      compile_static_library = function(library, objects, libraries, libdirs, name)  -- luacheck: ignore 211
+         local ok = execute(variables.AR, "rc", library, unpack(objects))
          if ok then
             ok = execute(variables.RANLIB, library)
          end
@@ -297,15 +285,15 @@ function builtin.run(rockspec, no_install)
          if ext == "lua" then
             local filename = dir.base_name(info)
             if filename == "init.lua" and not name:match("%.init$") then
-               moddir = path.module_to_path(name .. ".init")
+               moddir = path.module_to_path(name..".init")
             else
                local basename = name:match("([^.]+)$")
-               filename = basename .. ".lua"
+               filename = basename..".lua"
             end
             local dest = dir.path(luadir, moddir, filename)
             lua_modules[info] = dest
          else
-            info = { info }
+            info = {info}
          end
       end
       if type(info) == "table" then
@@ -326,21 +314,21 @@ function builtin.run(rockspec, no_install)
          local objects = {}
          local sources = info.sources
          if info[1] then sources = info end
-         if type(sources) == "string" then sources = { sources } end
-         if not (type(sources) == "table") then
+         if type(sources) == "string" then sources = {sources} end
+         if type(sources) ~= "table" then
             return nil, "error in rockspec: module '" .. name .. "' entry has no 'sources' list"
          end
          for _, source in ipairs(sources) do
-            if not (type(source) == "string") then
+            if type(source) ~= "string" then
                return nil, "error in rockspec: module '" .. name .. "' does not specify source correctly."
             end
-            local object = source:gsub("%.[^.]*$", "." .. cfg.obj_extension)
+            local object = source:gsub("%.[^.]*$", "."..cfg.obj_extension)
             if not object then
-               object = source .. "." .. cfg.obj_extension
+               object = source.."."..cfg.obj_extension
             end
             ok = compile_object(object, source, info.defines, info.incdirs or autoincdirs)
             if not ok then
-               return nil, "Failed compiling object " .. object
+               return nil, "Failed compiling object "..object
             end
             table.insert(objects, object)
          end
@@ -350,7 +338,7 @@ function builtin.run(rockspec, no_install)
             util.schedule_function(fs.delete, compile_temp_dir)
          end
 
-         local module_name = name:match("([^.]*)$") .. "." .. util.matchquote(cfg.lib_extension)
+         local module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.lib_extension)
          if moddir ~= "" then
             module_name = dir.path(moddir, module_name)
          end
@@ -362,46 +350,46 @@ function builtin.run(rockspec, no_install)
          lib_modules[build_name] = dir.path(libdir, module_name)
          ok = compile_library(build_name, objects, info.libraries, info.libdirs or autolibdirs, name)
          if not ok then
-            return nil, "Failed compiling module " .. module_name
+            return nil, "Failed compiling module "..module_name
          end
 
-
-
+         -- for backwards compatibility, try keeping a copy of the module
+         -- in the old location (luasec-1.3.2-1 rockspec breaks otherwise)
          if cached_make_dir(dir.dir_name(module_name)) then
             fs.copy(build_name, module_name)
          end
 
-
-
-
-
-
-
-
-
-
-
-
+         --[[ TODO disable static libs until we fix the conflict in the manifest, which will take extending the manifest format.
+         module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.static_lib_extension)
+         if moddir ~= "" then
+            module_name = dir.path(moddir, module_name)
+         end
+         lib_modules[module_name] = dir.path(libdir, module_name)
+         ok = compile_static_library(module_name, objects, info.libraries, info.libdirs, name)
+         if not ok then
+            return nil, "Failed compiling static library "..module_name
+         end
+         ]]
       end
    end
    if not no_install then
-      for _, mods in ipairs({ { tbl = lua_modules, perms = "read" }, { tbl = lib_modules, perms = "exec" } }) do
+      for _, mods in ipairs({{ tbl = lua_modules, perms = "read" }, { tbl = lib_modules, perms = "exec" }}) do
          for name, dest in pairs(mods.tbl) do
             cached_make_dir(dir.dir_name(dest))
             ok, err = fs.copy(name, dest, mods.perms)
             if not ok then
-               return nil, "Failed installing " .. name .. " in " .. dest .. ": " .. err
+               return nil, "Failed installing "..name.." in "..dest..": "..err
             end
          end
       end
       if fs.is_dir("lua") then
          ok, err = fs.copy_contents("lua", luadir)
          if not ok then
-            return nil, "Failed copying contents of 'lua' directory: " .. err
+            return nil, "Failed copying contents of 'lua' directory: "..err
          end
       end
    end
    return true
 end
 
-return builtin
+return builtin
\ No newline at end of file
diff --git a/src/luarocks/build/originals/cmake-original.lua b/src/luarocks/build/originals/cmake-original.lua
new file mode 100644
index 00000000..b7a4786e
--- /dev/null
+++ b/src/luarocks/build/originals/cmake-original.lua
@@ -0,0 +1,78 @@
+
+--- Build back-end for CMake-based modules.
+local cmake = {}
+
+local fs = require("luarocks.fs")
+local util = require("luarocks.util")
+local cfg = require("luarocks.core.cfg")
+
+--- Driver function for the "cmake" build back-end.
+-- @param rockspec table: the loaded rockspec.
+-- @return boolean or (nil, string): true if no errors occurred,
+-- nil and an error message otherwise.
+function cmake.run(rockspec, no_install)
+   assert(rockspec:type() == "rockspec")
+   local build = rockspec.build
+   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")
+   if not ok then
+      return nil, err_msg
+   end
+
+   -- If inline cmake is present create CMakeLists.txt from it.
+   if type(build.cmake) == "string" then
+      local cmake_handler = assert(io.open(fs.current_dir().."/CMakeLists.txt", "w"))
+      cmake_handler:write(build.cmake)
+      cmake_handler:close()
+   end
+
+   -- Execute cmake with variables.
+   local args = ""
+
+   -- Try to pick the best generator. With msvc and x64, CMake does not select it by default so we need to be explicit.
+   if cfg.cmake_generator then
+      args = args .. ' -G"'..cfg.cmake_generator.. '"'
+   elseif cfg.is_platform("windows") and cfg.target_cpu:match("x86_64$") then
+      args = args .. " -DCMAKE_GENERATOR_PLATFORM=x64"
+   end
+
+   for k,v in pairs(variables) do
+      args = args .. ' -D' ..k.. '="' ..tostring(v).. '"'
+   end
+
+   if not fs.execute_string(rockspec.variables.CMAKE.." -H. -Bbuild.luarocks "..args) then
+      return nil, "Failed cmake."
+   end
+
+   local do_build, do_install
+   if rockspec:format_is_at_least("3.0") then
+      do_build   = (build.build_pass   == nil) and true or build.build_pass
+      do_install = (build.install_pass == nil) and true or build.install_pass
+   else
+      do_build = true
+      do_install = true
+   end
+
+   if do_build then
+      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --config Release") then
+         return nil, "Failed building."
+      end
+   end
+   if do_install and not no_install then
+      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --target install --config Release") then
+         return nil, "Failed installing."
+      end
+   end
+
+   return true
+end
+
+return cmake
diff --git a/src/luarocks/build/originals/command-original.lua b/src/luarocks/build/originals/command-original.lua
new file mode 100644
index 00000000..b0c4aa79
--- /dev/null
+++ b/src/luarocks/build/originals/command-original.lua
@@ -0,0 +1,41 @@
+
+--- Build back-end for raw listing of commands in rockspec files.
+local command = {}
+
+local fs = require("luarocks.fs")
+local util = require("luarocks.util")
+local cfg = require("luarocks.core.cfg")
+
+--- Driver function for the "command" build back-end.
+-- @param rockspec table: the loaded rockspec.
+-- @return boolean or (nil, string): true if no errors occurred,
+-- nil and an error message otherwise.
+function command.run(rockspec, not_install)
+   assert(rockspec:type() == "rockspec")
+
+   local build = rockspec.build
+
+   util.variable_substitutions(build, rockspec.variables)
+
+   local env = {
+      CC = cfg.variables.CC,
+      --LD = cfg.variables.LD,
+      --CFLAGS = cfg.variables.CFLAGS,
+   }
+
+   if build.build_command then
+      util.printout(build.build_command)
+      if not fs.execute_env(env, build.build_command) then
+         return nil, "Failed building."
+      end
+   end
+   if build.install_command and not not_install then
+      util.printout(build.install_command)
+      if not fs.execute_env(env, build.install_command) then
+         return nil, "Failed installing."
+      end
+   end
+   return true
+end
+
+return command
diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index 1e03445a..409d2441 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -86,6 +86,9 @@ local record cfg
    -- cmake
    cmake_generator: string
    target_cpu: string
+   -- make
+   makefile: string
+   make: string
 end
 
 return cfg
\ No newline at end of file
diff --git a/src/luarocks/core/types/build.d.tl b/src/luarocks/core/types/build.d.tl
index 061741bb..e2acdda3 100644
--- a/src/luarocks/core/types/build.d.tl
+++ b/src/luarocks/core/types/build.d.tl
@@ -1,60 +1,66 @@
-local type i = require("luarocks.core.types.installs")
-local type Installs = i.Installs
-
 local record build
 
-    interface Build
-        type: string
-        install: Installs
-        copy_directories: {string}
-        patches: {string : string}
-        extra_files: {string : string}
-        macosx_deployment_target: string
-    end
-
-    record BuiltinBuild
-        is Build
-        where self.type == "builtin"
-
-        record Module
-            is {string}
-            sources: string | {string}
-            libraries: string | {string}
-            defines: {string}
-            incdirs: {string}
-            libdirs: {string}
-        end
-
-        modules: {string: (string | Module)}
-    end
-
-
-    record CMakeBuild
-        is Build where self.type == "cmake"
-
-        cmake: string
-        variables: {string: string}
-    end
-
-    record CommandBuild
-        is Build where self.type == "command"
-
-        build_command: string
-        install_command: string
-    end
-
-    record MakeBuild
-        is Build where self.type == "make"
-
-        makefile: string
-        build_target: string
-        build_pass: boolean
-        install_target: string
-        install_pass: boolean
-        build_variables: {string} --!
-        install_variables: {string}
-        variables: {string: string}
-    end
+   interface Build
+      record Install
+         lua: {string}
+         lib: {string}
+         conf: {string}
+         bin: {string}
+      end
+      
+      type: string
+      install: Install
+      copy_directories: {string}
+      patches: {string : string}
+      extra_files: {string : string}
+      macosx_deployment_target: string
+   end
+
+   record BuiltinBuild
+      is Build
+      where self.type == "builtin"
+
+      record Module
+         is {string}
+         sources: string | {string}
+         libraries: string | {string}
+         defines: {string}
+         incdirs: {string}
+         libdirs: {string}
+      end
+
+      modules: {string: (string | Module)}
+   end
+
+
+   record CMakeBuild
+      is Build where self.type == "cmake"
+
+      cmake: string
+      variables: {string: string}
+      build_pass: boolean
+      install_pass: boolean
+   end
+
+   record CommandBuild
+      is Build where self.type == "command"
+
+      build_command: string
+      install_command: string
+   end
+
+   record MakeBuild
+      is Build where self.type == "make"
+
+      makefile: string
+      build_target: string
+      build_pass: boolean
+      install_target: string
+      install_pass: boolean
+      build_variables: {string: string}
+      install_variables: {string: string}
+      variables: {string: string}
+   end
 end
 
 return build
\ No newline at end of file
diff --git a/src/luarocks/core/types/installs.d.tl b/src/luarocks/core/types/installs.d.tl
index 92e58658..57ad750a 100644
--- a/src/luarocks/core/types/installs.d.tl
+++ b/src/luarocks/core/types/installs.d.tl
@@ -1,17 +1,17 @@
 local record installs
-    record Install
-        is {string}
-        name: string
-        is_module_path: boolean
-        perms: string
-    end
-  
-    record Installs
-        lua: Install
-        lib: Install
-        conf: Install
-        bin: Install
-    end
+   record InstallDir
+      name: string
+      is_module_path: boolean
+      perms: string
+   end
+
+   record InstallDirs
+      lua: InstallDir
+      lib: InstallDir
+      conf: InstallDir
+      bin: InstallDir
+   end
+
 end
 
 return installs
\ No newline at end of file
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index ce055567..3e099af5 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -62,6 +62,8 @@ local record fs
    -- build
    apply_patch: function(string, string, boolean): boolean, string
    copy_contents: function(string, string): boolean, string
+   --command
+   execute_env: function({any: any}, string, ...:string): boolean
 end
 
 return fs