make and pack

4 files changed, 360 insertions, 71 deletions

diff --git a/src/luarocks/build/make.lua b/src/luarocks/build/make.lua
index 4345ddff..6601c637 100644
--- a/src/luarocks/build/make.lua
+++ b/src/luarocks/build/make.lua
@@ -1,45 +1,45 @@
+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 ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
 
---- Build back-end for using Makefile-based packages.
 local make = {}
 
-local unpack = unpack or table.unpack
 
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 
---- 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
--- the appropriate platform-specific default).
--- @param pass boolean: If true, run make; if false, do nothing.
--- @param target string: The make target; an empty string indicates
--- the default target.
--- @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 function make_pass(make_cmd, pass, target, variables)
    local assignments = {}
-   for k,v in pairs(variables) do
-      table.insert(assignments, k.."="..v)
+   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, _tl_table_unpack(assignments))
    else
       return true
    end
 end
 
---- Driver function for the "make" 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 make.run(rockspec, not_install)
-   assert(rockspec:type() == "rockspec")
 
    local build = rockspec.build
 
@@ -51,9 +51,9 @@ function make.run(rockspec, not_install)
    build.install_target = build.install_target or "install"
    local makefile = build.makefile or cfg.makefile
    if makefile then
-      -- Assumes all make's accept -f. True for POSIX make, GNU make and Microsoft nmake.
-      build.build_target = "-f "..makefile.." "..build.build_target
-      build.install_target = "-f "..makefile.." "..build.install_target
+
+      build.build_target = "-f " .. makefile .. " " .. build.build_target
+      build.install_target = "-f " .. makefile .. " " .. build.install_target
    end
 
    if build.variables then
@@ -63,14 +63,13 @@ function make.run(rockspec, not_install)
       end
    end
 
-   util.warn_if_not_used(build.build_variables, { CFLAGS=true }, "variable %s was not passed in build_variables")
-
+   util.warn_if_not_used(build.build_variables, { CFLAGS = true }, "variable %s was not passed in build_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
@@ -79,7 +78,7 @@ function make.run(rockspec, not_install)
       end
    end
 
-   -- backwards compatibility
+
    local make_cmd = cfg.make or rockspec.variables.MAKE
 
    local ok = make_pass(make_cmd, build.build_pass, build.build_target, build.build_variables)
diff --git a/src/luarocks/build/originals/make-original.lua b/src/luarocks/build/originals/make-original.lua
new file mode 100644
index 00000000..4345ddff
--- /dev/null
+++ b/src/luarocks/build/originals/make-original.lua
@@ -0,0 +1,98 @@
+
+--- Build back-end for using Makefile-based packages.
+local make = {}
+
+local unpack = unpack or table.unpack
+
+local fs = require("luarocks.fs")
+local util = require("luarocks.util")
+local cfg = require("luarocks.core.cfg")
+
+--- 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
+-- the appropriate platform-specific default).
+-- @param pass boolean: If true, run make; if false, do nothing.
+-- @param target string: The make target; an empty string indicates
+-- the default target.
+-- @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 = {}
+   for k,v in pairs(variables) do
+      table.insert(assignments, k.."="..v)
+   end
+   if pass then
+      return fs.execute(make_cmd.." "..target, unpack(assignments))
+   else
+      return true
+   end
+end
+
+--- Driver function for the "make" 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 make.run(rockspec, not_install)
+   assert(rockspec:type() == "rockspec")
+
+   local build = rockspec.build
+
+   if build.build_pass == nil then build.build_pass = true end
+   if build.install_pass == nil then build.install_pass = true end
+   build.build_variables = build.build_variables or {}
+   build.install_variables = build.install_variables or {}
+   build.build_target = build.build_target or ""
+   build.install_target = build.install_target or "install"
+   local makefile = build.makefile or cfg.makefile
+   if makefile then
+      -- Assumes all make's accept -f. True for POSIX make, GNU make and Microsoft nmake.
+      build.build_target = "-f "..makefile.." "..build.build_target
+      build.install_target = "-f "..makefile.." "..build.install_target
+   end
+
+   if build.variables then
+      for var, val in pairs(build.variables) do
+         build.build_variables[var] = val
+         build.install_variables[var] = val
+      end
+   end
+
+   util.warn_if_not_used(build.build_variables, { CFLAGS=true }, "variable %s was not passed in build_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
+      if not build.build_variables[variable] then
+         build.build_variables[variable] = rockspec.variables[variable]
+      end
+      if not build.install_variables[variable] then
+         build.install_variables[variable] = rockspec.variables[variable]
+      end
+   end
+
+   -- backwards compatibility
+   local make_cmd = cfg.make or rockspec.variables.MAKE
+
+   local ok = make_pass(make_cmd, build.build_pass, build.build_target, build.build_variables)
+   if not ok then
+      return nil, "Failed building."
+   end
+   if not not_install then
+      ok = make_pass(make_cmd, build.install_pass, build.install_target, build.install_variables)
+      if not ok then
+         return nil, "Failed installing."
+      end
+   end
+   return true
+end
+
+return make
diff --git a/src/luarocks/pack-original.lua b/src/luarocks/pack-original.lua
new file mode 100644
index 00000000..731f49dd
--- /dev/null
+++ b/src/luarocks/pack-original.lua
@@ -0,0 +1,184 @@
+
+-- Create rock files, packing sources or binaries.
+local pack = {}
+
+local unpack = unpack or table.unpack
+
+local queries = require("luarocks.queries")
+local path = require("luarocks.path")
+local repos = require("luarocks.repos")
+local fetch = require("luarocks.fetch")
+local fs = require("luarocks.fs")
+local cfg = require("luarocks.core.cfg")
+local util = require("luarocks.util")
+local dir = require("luarocks.dir")
+local manif = require("luarocks.manif")
+local search = require("luarocks.search")
+local signing = require("luarocks.signing")
+
+--- Create a source rock.
+-- Packages a rockspec and its required source files in a rock
+-- file with the .src.rock extension, which can later be built and
+-- installed with the "build" command.
+-- @param rockspec_file string: An URL or pathname for a rockspec file.
+-- @return string or (nil, string): The filename of the resulting
+-- .src.rock file; or nil and an error message.
+function pack.pack_source_rock(rockspec_file)
+   assert(type(rockspec_file) == "string")
+
+   local rockspec, err = fetch.load_rockspec(rockspec_file)
+   if err then
+      return nil, "Error loading rockspec: "..err
+   end
+   rockspec_file = rockspec.local_abs_filename
+
+   local name_version = rockspec.name .. "-" .. rockspec.version
+   local rock_file = fs.absolute_name(name_version .. ".src.rock")
+
+   local temp_dir, err = fs.make_temp_dir("pack-"..name_version)
+   if not temp_dir then
+      return nil, "Failed creating temporary directory: "..err
+   end
+   util.schedule_function(fs.delete, temp_dir)
+
+   local source_file, source_dir = fetch.fetch_sources(rockspec, true, temp_dir)
+   if not source_file then
+      return nil, source_dir
+   end
+   local ok, err = fs.change_dir(source_dir)
+   if not ok then return nil, err end
+
+   fs.delete(rock_file)
+   fs.copy(rockspec_file, source_dir, "read")
+   ok, err = fs.zip(rock_file, dir.base_name(rockspec_file), dir.base_name(source_file))
+   if not ok then
+      return nil, "Failed packing "..rock_file.." - "..err
+   end
+   fs.pop_dir()
+
+   return rock_file
+end
+
+local function copy_back_files(name, version, file_tree, deploy_dir, pack_dir, perms)
+   local ok, err = fs.make_dir(pack_dir)
+   if not ok then return nil, err end
+   for file, sub in pairs(file_tree) do
+      local source = dir.path(deploy_dir, file)
+      local target = dir.path(pack_dir, file)
+      if type(sub) == "table" then
+         local ok, err = copy_back_files(name, version, sub, source, target)
+         if not ok then return nil, err end
+      else
+         local versioned = path.versioned_name(source, deploy_dir, name, version)
+         if fs.exists(versioned) then
+            fs.copy(versioned, target, perms)
+         else
+            fs.copy(source, target, perms)
+         end
+      end
+   end
+   return true
+end
+
+-- @param name string: Name of package to pack.
+-- @param version string or nil: A version number may also be passed.
+-- @param tree string or nil: An optional tree to pick the package from.
+-- @return string or (nil, string): The filename of the resulting
+-- .src.rock file; or nil and an error message.
+function pack.pack_installed_rock(query, tree)
+
+   local name, version, repo, repo_url = search.pick_installed_rock(query, tree)
+   if not name then
+      return nil, version
+   end
+
+   local root = path.root_from_rocks_dir(repo_url)
+   local prefix = path.install_dir(name, version, root)
+   if not fs.exists(prefix) then
+      return nil, "'"..name.." "..version.."' does not seem to be an installed rock."
+   end
+
+   local rock_manifest, err = manif.load_rock_manifest(name, version, root)
+   if not rock_manifest then return nil, err end
+
+   local name_version = name .. "-" .. version
+   local rock_file = fs.absolute_name(name_version .. "."..cfg.arch..".rock")
+
+   local temp_dir = fs.make_temp_dir("pack")
+   fs.copy_contents(prefix, temp_dir)
+
+   local is_binary = false
+   if rock_manifest.lib then
+      local ok, err = copy_back_files(name, version, rock_manifest.lib, path.deploy_lib_dir(repo), dir.path(temp_dir, "lib"), "exec")
+      if not ok then return nil, "Failed copying back files: " .. err end
+      is_binary = true
+   end
+   if rock_manifest.lua then
+      local ok, err = copy_back_files(name, version, rock_manifest.lua, path.deploy_lua_dir(repo), dir.path(temp_dir, "lua"), "read")
+      if not ok then return nil, "Failed copying back files: " .. err end
+   end
+
+   local ok, err = fs.change_dir(temp_dir)
+   if not ok then return nil, err end
+   if not is_binary and not repos.has_binaries(name, version) then
+      rock_file = rock_file:gsub("%."..cfg.arch:gsub("%-","%%-").."%.", ".all.")
+   end
+   fs.delete(rock_file)
+   ok, err = fs.zip(rock_file, unpack(fs.list_dir()))
+   if not ok then
+      return nil, "Failed packing " .. rock_file .. " - " .. err
+   end
+   fs.pop_dir()
+   fs.delete(temp_dir)
+   return rock_file
+end
+
+function pack.report_and_sign_local_file(file, err, sign)
+   if err then
+      return nil, err
+   end
+   local sigfile
+   if sign then
+      sigfile, err = signing.sign_file(file)
+      util.printout()
+   end
+   util.printout("Packed: "..file)
+   if sigfile then
+      util.printout("Signature stored in: "..sigfile)
+   end
+   if err then
+      return nil, err
+   end
+   return true
+end
+
+function pack.pack_binary_rock(name, namespace, version, sign, cmd)
+
+   -- The --pack-binary-rock option for "luarocks build" basically performs
+   -- "luarocks build" on a temporary tree and then "luarocks pack". The
+   -- alternative would require refactoring parts of luarocks.build and
+   -- luarocks.pack, which would save a few file operations: the idea would be
+   -- to shave off the final deploy steps from the build phase and the initial
+   -- collect steps from the pack phase.
+
+   local temp_dir, err = fs.make_temp_dir("luarocks-build-pack-"..dir.base_name(name))
+   if not temp_dir then
+      return nil, "Failed creating temporary directory: "..err
+   end
+   util.schedule_function(fs.delete, temp_dir)
+
+   path.use_tree(temp_dir)
+   local ok, err = cmd()
+   if not ok then
+      return nil, err
+   end
+   local rname, rversion = path.parse_name(name)
+   if not rname then
+      rname, rversion = name, version
+   end
+   local query = queries.new(rname, namespace, rversion)
+   local file, err = pack.pack_installed_rock(query, temp_dir)
+   return pack.report_and_sign_local_file(file, err, sign)
+end
+
+return pack
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 731f49dd..e083f509 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -1,8 +1,7 @@
+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 pairs = _tl_compat and _tl_compat.pairs or pairs; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
 
--- Create rock files, packing sources or binaries.
 local pack = {}
 
-local unpack = unpack or table.unpack
 
 local queries = require("luarocks.queries")
 local path = require("luarocks.path")
@@ -16,28 +15,37 @@ local manif = require("luarocks.manif")
 local search = require("luarocks.search")
 local signing = require("luarocks.signing")
 
---- Create a source rock.
--- Packages a rockspec and its required source files in a rock
--- file with the .src.rock extension, which can later be built and
--- installed with the "build" command.
--- @param rockspec_file string: An URL or pathname for a rockspec file.
--- @return string or (nil, string): The filename of the resulting
--- .src.rock file; or nil and an error message.
+
+
+
+
+
+
+
+local RockManifest = rm.RockManifest
+
+
+
+
+
+
+
+
+
 function pack.pack_source_rock(rockspec_file)
-   assert(type(rockspec_file) == "string")
 
-   local rockspec, err = fetch.load_rockspec(rockspec_file)
-   if err then
-      return nil, "Error loading rockspec: "..err
+   local rockspec, errload = fetch.load_rockspec(rockspec_file)
+   if errload then
+      return nil, "Error loading rockspec: " .. errload
    end
    rockspec_file = rockspec.local_abs_filename
 
    local name_version = rockspec.name .. "-" .. rockspec.version
    local rock_file = fs.absolute_name(name_version .. ".src.rock")
 
-   local temp_dir, err = fs.make_temp_dir("pack-"..name_version)
+   local temp_dir, err = fs.make_temp_dir("pack-" .. name_version)
    if not temp_dir then
-      return nil, "Failed creating temporary directory: "..err
+      return nil, "Failed creating temporary directory: " .. err
    end
    util.schedule_function(fs.delete, temp_dir)
 
@@ -45,14 +53,14 @@ function pack.pack_source_rock(rockspec_file)
    if not source_file then
       return nil, source_dir
    end
-   local ok, err = fs.change_dir(source_dir)
-   if not ok then return nil, err end
+   local ok, errchange = fs.change_dir(source_dir)
+   if not ok then return nil, errchange end
 
    fs.delete(rock_file)
    fs.copy(rockspec_file, source_dir, "read")
    ok, err = fs.zip(rock_file, dir.base_name(rockspec_file), dir.base_name(source_file))
    if not ok then
-      return nil, "Failed packing "..rock_file.." - "..err
+      return nil, "Failed packing " .. rock_file .. " - " .. err
    end
    fs.pop_dir()
 
@@ -66,7 +74,7 @@ local function copy_back_files(name, version, file_tree, deploy_dir, pack_dir, p
       local source = dir.path(deploy_dir, file)
       local target = dir.path(pack_dir, file)
       if type(sub) == "table" then
-         local ok, err = copy_back_files(name, version, sub, source, target)
+         ok, err = copy_back_files(name, version, sub, source, target)
          if not ok then return nil, err end
       else
          local versioned = path.versioned_name(source, deploy_dir, name, version)
@@ -80,11 +88,11 @@ local function copy_back_files(name, version, file_tree, deploy_dir, pack_dir, p
    return true
 end
 
--- @param name string: Name of package to pack.
--- @param version string or nil: A version number may also be passed.
--- @param tree string or nil: An optional tree to pick the package from.
--- @return string or (nil, string): The filename of the resulting
--- .src.rock file; or nil and an error message.
+
+
+
+
+
 function pack.pack_installed_rock(query, tree)
 
    local name, version, repo, repo_url = search.pick_installed_rock(query, tree)
@@ -95,36 +103,36 @@ function pack.pack_installed_rock(query, tree)
    local root = path.root_from_rocks_dir(repo_url)
    local prefix = path.install_dir(name, version, root)
    if not fs.exists(prefix) then
-      return nil, "'"..name.." "..version.."' does not seem to be an installed rock."
+      return nil, "'" .. name .. " " .. version .. "' does not seem to be an installed rock."
    end
 
    local rock_manifest, err = manif.load_rock_manifest(name, version, root)
    if not rock_manifest then return nil, err end
 
    local name_version = name .. "-" .. version
-   local rock_file = fs.absolute_name(name_version .. "."..cfg.arch..".rock")
+   local rock_file = fs.absolute_name(name_version .. "." .. cfg.arch .. ".rock")
 
    local temp_dir = fs.make_temp_dir("pack")
    fs.copy_contents(prefix, temp_dir)
 
    local is_binary = false
    if rock_manifest.lib then
-      local ok, err = copy_back_files(name, version, rock_manifest.lib, path.deploy_lib_dir(repo), dir.path(temp_dir, "lib"), "exec")
+      local ok, err = copy_back_files(name, version, (rock_manifest.lib), path.deploy_lib_dir(repo), dir.path(temp_dir, "lib"), "exec")
       if not ok then return nil, "Failed copying back files: " .. err end
       is_binary = true
    end
    if rock_manifest.lua then
-      local ok, err = copy_back_files(name, version, rock_manifest.lua, path.deploy_lua_dir(repo), dir.path(temp_dir, "lua"), "read")
+      local ok, err = copy_back_files(name, version, (rock_manifest.lua), path.deploy_lua_dir(repo), dir.path(temp_dir, "lua"), "read")
       if not ok then return nil, "Failed copying back files: " .. err end
    end
 
    local ok, err = fs.change_dir(temp_dir)
    if not ok then return nil, err end
    if not is_binary and not repos.has_binaries(name, version) then
-      rock_file = rock_file:gsub("%."..cfg.arch:gsub("%-","%%-").."%.", ".all.")
+      rock_file = rock_file:gsub("%." .. cfg.arch:gsub("%-", "%%-") .. "%.", ".all.")
    end
    fs.delete(rock_file)
-   ok, err = fs.zip(rock_file, unpack(fs.list_dir()))
+   ok, err = fs.zip(rock_file, _tl_table_unpack(fs.list_dir()))
    if not ok then
       return nil, "Failed packing " .. rock_file .. " - " .. err
    end
@@ -142,9 +150,9 @@ function pack.report_and_sign_local_file(file, err, sign)
       sigfile, err = signing.sign_file(file)
       util.printout()
    end
-   util.printout("Packed: "..file)
+   util.printout("Packed: " .. file)
    if sigfile then
-      util.printout("Signature stored in: "..sigfile)
+      util.printout("Signature stored in: " .. sigfile)
    end
    if err then
       return nil, err
@@ -154,16 +162,16 @@ end
 
 function pack.pack_binary_rock(name, namespace, version, sign, cmd)
 
-   -- The --pack-binary-rock option for "luarocks build" basically performs
-   -- "luarocks build" on a temporary tree and then "luarocks pack". The
-   -- alternative would require refactoring parts of luarocks.build and
-   -- luarocks.pack, which would save a few file operations: the idea would be
-   -- to shave off the final deploy steps from the build phase and the initial
-   -- collect steps from the pack phase.
 
-   local temp_dir, err = fs.make_temp_dir("luarocks-build-pack-"..dir.base_name(name))
+
+
+
+
+
+
+   local temp_dir, err = fs.make_temp_dir("luarocks-build-pack-" .. dir.base_name(name))
    if not temp_dir then
-      return nil, "Failed creating temporary directory: "..err
+      return nil, "Failed creating temporary directory: " .. err
    end
    util.schedule_function(fs.delete, temp_dir)