1 files changed, 80 insertions, 34 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 2b48d576..1147d725 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -1,7 +1,4 @@
 
-local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, type, assert =
-      rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, type, assert
-
 --- Configuration for LuaRocks.
 -- Tries to load the user's configuration file and
 -- defines defaults for unset values. See the
@@ -10,21 +7,26 @@ local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs,
 --
 -- End-users shouldn't edit this file. They can override any defaults
 -- set in this file using their system-wide $LUAROCKS_SYSCONFIG file
--- (see luarocks.config) or their user-specific configuration file
+-- (see luarocks.site_config) or their user-specific configuration file
 -- (~/.luarocks/config.lua on Unix or %APPDATA%/luarocks/config.lua on
 -- Windows).
+
+local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, type, assert, _VERSION =
+      rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, type, assert, _VERSION
+
 module("luarocks.cfg")
 
 -- Load site-local global configurations
-local ok, config = pcall(require, "luarocks.config")
+local ok, site_config = pcall(require, "luarocks.site_config")
 if not ok then
-   io.stderr:write("Site-local luarocks/config.lua file not found. Incomplete installation?\n")
-   config = {}
+   io.stderr:write("Site-local luarocks/site_config.lua file not found. Incomplete installation?\n")
+   site_config = {}
 end
 
-_M.config = config
+_M.site_config = site_config
 
-program_version = "2.0.5"
+lua_version = _VERSION:sub(5)
+program_version = "2.0.8"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
@@ -46,12 +48,12 @@ local detected = {}
 local system,proc
 
 -- A proper installation of LuaRocks will hardcode the system
--- and proc values with config.LUAROCKS_UNAME_S and config.LUAROCKS_UNAME_M,
+-- and proc values with site_config.LUAROCKS_UNAME_S and site_config.LUAROCKS_UNAME_M,
 -- so that this detection does not run every time. When it is
 -- performed, we use the Unix way to identify the system,
 -- even on Windows (assuming UnxUtils or Cygwin).
-system = config.LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
-proc = config.LUAROCKS_UNAME_M or io.popen("uname -m"):read("*l")
+system = site_config.LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
+proc = site_config.LUAROCKS_UNAME_M or io.popen("uname -m"):read("*l")
 if proc:match("i[%d]86") then
    proc = "x86"
 elseif proc:match("amd64") or proc:match("x86_64") then
@@ -75,6 +77,9 @@ elseif system == "Darwin" then
 elseif system == "Linux" then
    detected.unix = true
    detected.linux = true
+elseif system == "SunOS" then
+   detected.unix = true
+   detected.solaris = true
 elseif system and system:match("^CYGWIN") then
    detected.unix = true
    detected.cygwin = true
@@ -90,6 +95,7 @@ end
 -- Path configuration:
 
 local sys_config_file, home_config_file
+local sys_config_ok, home_config_ok = false, false
 if detected.windows or detected.mingw32 then
    home = os.getenv("APPDATA") or "c:"
    sys_config_file = "c:/luarocks/config.lua"
@@ -105,14 +111,34 @@ end
 variables = {}
 rocks_trees = {}
 
-persist.load_into_table(config.LUAROCKS_SYSCONFIG or sys_config_file, _M)
+local ok, err = persist.load_into_table(site_config.LUAROCKS_SYSCONFIG or sys_config_file, _M)
+if ok then
+   sys_config_ok = true
+else -- nil or false
+   sys_config_ok = ok
+   if err and ok == nil then
+      io.stderr:write(err.."\n")
+   end
+end
 
-if not config.LUAROCKS_FORCE_CONFIG then
+if not site_config.LUAROCKS_FORCE_CONFIG then
    home_config_file = os.getenv("LUAROCKS_CONFIG") or home_config_file
-   local home_overrides = persist.load_into_table(home_config_file, { home = home })
+   local home_overrides, err = persist.load_into_table(home_config_file, { home = home })
    if home_overrides then
+      home_config_ok = true
       local util = require("luarocks.util")
+      if home_overrides.rocks_trees then
+         _M.rocks_trees = nil
+      end
+      if home_overrides.rocks_servers then
+         _M.rocks_servers = nil
+      end
       util.deep_merge(_M, home_overrides)
+   else -- nil or false
+      home_config_ok = home_overrides
+      if err and home_config_ok == nil then
+         io.stderr:write(err.."\n")
+      end
    end
 end
 
@@ -120,8 +146,8 @@ if not next(rocks_trees) then
    if home_tree then
       table.insert(rocks_trees, home_tree)
    end
-   if config.LUAROCKS_ROCKS_TREE then
-      table.insert(rocks_trees, config.LUAROCKS_ROCKS_TREE)
+   if site_config.LUAROCKS_ROCKS_TREE then
+      table.insert(rocks_trees, site_config.LUAROCKS_ROCKS_TREE)
    end
 end
 
@@ -129,8 +155,13 @@ end
 
 local root = rocks_trees[#rocks_trees]
 local defaults = {
-   lua_modules_path = "/share/lua/5.1/",
-   lib_modules_path = "/lib/lua/5.1/",
+
+   local_by_default = false,
+   use_extensions = false,
+   accept_unknown_fields = false,
+
+   lua_modules_path = "/share/lua/"..lua_version,
+   lib_modules_path = "/lib/lua/"..lua_version,
 
    arch = "unknown",
    lib_extension = "unknown",
@@ -141,9 +172,9 @@ local defaults = {
    },
 
    lua_extension = "lua",
-   lua_interpreter = config.LUA_INTERPRETER or "lua",
-   downloader = config.LUAROCKS_DOWNLOADER or "wget",
-   md5checker = config.LUAROCKS_MD5CHECKER or "md5sum",
+   lua_interpreter = site_config.LUA_INTERPRETER or "lua",
+   downloader = site_config.LUAROCKS_DOWNLOADER or "wget",
+   md5checker = site_config.LUAROCKS_MD5CHECKER or "md5sum",
 
    variables = {
       MAKE = "make",
@@ -183,6 +214,7 @@ local defaults = {
       MD5 = "md5",
       STAT = "stat",
       
+      CMAKE = "cmake",
       SEVENZ = "7z",
       
       STATFLAG = "-c '%a'",
@@ -208,19 +240,21 @@ if detected.windows then
    defaults.external_lib_extension = "dll"
    defaults.obj_extension = "obj"
    defaults.external_deps_dirs = { "c:/external/" }
-   defaults.variables.LUA_BINDIR = config.LUA_BINDIR and config.LUA_BINDIR:gsub("\\", "/") or "c:/lua5.1/bin"
-   defaults.variables.LUA_INCDIR = config.LUA_INCDIR and config.LUA_INCDIR:gsub("\\", "/") or "c:/lua5.1/include"
-   defaults.variables.LUA_LIBDIR = config.LUA_LIBDIR and config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua5.1/lib"
+   defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR and site_config.LUA_BINDIR:gsub("\\", "/") or "c:/lua"..lua_version.."/bin"
+   defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR and site_config.LUA_INCDIR:gsub("\\", "/") or "c:/lua"..lua_version.."/include"
+   defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR and site_config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua"..lua_version.."/lib"
    defaults.cmake_generator = "MinGW Makefiles"
    defaults.makefile = "Makefile.win"
    defaults.variables.MAKE = "nmake" -- TODO: Split Windows flavors between mingw and msvc
    defaults.variables.CC = "cl"
    defaults.variables.RC = "rc"
-   defaults.variables.WRAPPER = config.LUAROCKS_PREFIX .. "\\2.0\\rclauncher.obj"
+   defaults.variables.WRAPPER = site_config.LUAROCKS_PREFIX .. "\\2.0\\rclauncher.obj"
    defaults.variables.LD = "link"
    defaults.variables.MT = "mt"
+   defaults.variables.LUALIB = "lua"..lua_version..".lib"
    defaults.variables.CFLAGS = "/MD /O2"
    defaults.variables.LIBFLAG = "/dll"
+   defaults.variables.LUALIB = "lua"..lua_version..".lib"
    defaults.external_deps_patterns = {
       bin = { "?.exe", "?.bat" },
       lib = { "?.lib", "?.dll", "lib?.dll" },
@@ -244,15 +278,15 @@ if detected.mingw32 then
    defaults.external_lib_extension = "dll"
    defaults.obj_extension = "o"
    defaults.external_deps_dirs = { "c:/external/" }
-   defaults.variables.LUA_BINDIR = config.LUA_BINDIR and config.LUA_BINDIR:gsub("\\", "/") or "c:/lua5.1/bin"
-   defaults.variables.LUA_INCDIR = config.LUA_INCDIR and config.LUA_INCDIR:gsub("\\", "/") or "c:/lua5.1/include"
-   defaults.variables.LUA_LIBDIR = config.LUA_LIBDIR and config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua5.1/lib"
+   defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR and site_config.LUA_BINDIR:gsub("\\", "/") or "c:/lua"..lua_version.."/bin"
+   defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR and site_config.LUA_INCDIR:gsub("\\", "/") or "c:/lua"..lua_version.."/include"
+   defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR and site_config.LUA_LIBDIR:gsub("\\", "/") or "c:/lua"..lua_version.."/lib"
    defaults.cmake_generator = "MinGW Makefiles"
    defaults.make = "mingw32-make" -- TODO: Split Windows flavors between mingw and msvc
    defaults.makefile = "Makefile.win"
    defaults.variables.CC = "mingw32-gcc"
    defaults.variables.RC = "windres"
-   defaults.variables.WRAPPER = config.LUAROCKS_PREFIX .. "\\2.0\\rclauncher.o"
+   defaults.variables.WRAPPER = site_config.LUAROCKS_PREFIX .. "\\2.0\\rclauncher.o"
    defaults.variables.LD = "mingw32-gcc"
    defaults.variables.CFLAGS = "-O2"
    defaults.variables.LIBFLAG = "-shared"
@@ -276,9 +310,9 @@ if detected.unix then
    defaults.external_lib_extension = "so"
    defaults.obj_extension = "o"
    defaults.external_deps_dirs = { "/usr/local", "/usr" }
-   defaults.variables.LUA_BINDIR = config.LUA_BINDIR or "/usr/local/bin"
-   defaults.variables.LUA_INCDIR = config.LUA_INCDIR or "/usr/local/include"
-   defaults.variables.LUA_LIBDIR = config.LUA_LIBDIR or "/usr/local/lib"
+   defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin"
+   defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include"
+   defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib"
    defaults.variables.CFLAGS = "-O2"
    defaults.cmake_generator = "Unix Makefiles"
    defaults.platforms = { "unix" }
@@ -347,11 +381,19 @@ if detected.openbsd then
    defaults.variables.STATFLAG = "-f '%Op'"
 end
 
+if detected.solaris then
+   defaults.arch = "solaris-"..proc
+   defaults.platforms = {"unix", "solaris"}
+   defaults.variables.MAKE = "gmake"
+   defaults.variables.CC = "gcc"
+   defaults.variables.LD = "gcc"
+end
+
 -- Expose some more values detected by LuaRocks for use by rockspec authors.
 defaults.variables.LUA = defaults.lua_interpreter
 defaults.variables.LIB_EXTENSION = defaults.lib_extension
 defaults.variables.OBJ_EXTENSION = defaults.obj_extension
-defaults.variables.LUAROCKS_PREFIX = config.LUAROCKS_PREFIX
+defaults.variables.LUAROCKS_PREFIX = site_config.LUAROCKS_PREFIX
 
 -- Use defaults:
 
@@ -389,6 +431,10 @@ for _,tree in ipairs(rocks_trees) do
   end
 end
 
+function which_config()
+   return sys_config_file, sys_config_ok, home_config_file, home_config_ok
+end
+
 --- Check if platform was detected
 -- @param query string: The platform name to check.
 -- @return boolean: true if LuaRocks is currently running on queried platform.