Merge branch 'master' into luarocks-3

7 files changed, 63 insertions, 42 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 140308ce..abf15af6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ environment:
   matrix:
   - LUA_VER: 5.1.5
   - LUA_VER: 5.2.4
-  - LUA_VER: 5.3.0
+  - LUA_VER: 5.3.1
   - LJ_VER: 2.0.4
   - LJ_VER: 2.1
 
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index c8f5a669..7b16fa51 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -35,14 +35,18 @@ function cmake.run(rockspec)
       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.. '="' ..v.. '"'
+      args = args .. ' -D' ..k.. '="' ..tostring(v).. '"'
    end
 
    if not fs.execute_string(rockspec.variables.CMAKE.." -H. -Bbuild.luarocks "..args) then
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 2a92c4dd..8321e9b9 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -144,34 +144,52 @@ end
 cfg.variables = {}
 cfg.rocks_trees = {}
 
--- The global environment in the config files;
-local env_for_config_file
-env_for_config_file = {
-   home = cfg.home,
-   lua_version = cfg.lua_version,
-   platform = util.make_shallow_copy(detected),
-   processor = cfg.target_cpu,   -- remains for compat reasons
-   target_cpu = cfg.target_cpu,  -- replaces `processor`
-   os_getenv = os.getenv, 
-   dump_env = function()
-     -- debug function, calling it from a config file will show all 
-     -- available globals to that config file
-     print(util.show_table(env_for_config_file, "global environment"))
-   end,
-}
+-- Create global environment for the config files;
+local env_for_config_file = function() 
+   local e 
+   e = {
+      home = cfg.home,
+      lua_version = cfg.lua_version,
+      platform = util.make_shallow_copy(detected),
+      processor = cfg.target_cpu,   -- remains for compat reasons
+      target_cpu = cfg.target_cpu,  -- replaces `processor`
+      os_getenv = os.getenv, 
+      dump_env = function()
+         -- debug function, calling it from a config file will show all 
+         -- available globals to that config file
+         print(util.show_table(e, "global environment"))
+      end,
+   }
+   return e
+end
+
+-- Merge values from config files read into the `cfg` table
+local merge_overrides = function(overrides)
+   -- remove some stuff we do not want to integrate
+   overrides.os_getenv = nil
+   overrides.dump_env = nil
+   -- remove tables to be copied verbatim instead of deeply merged
+   if overrides.rocks_trees   then cfg.rocks_trees   = nil end
+   if overrides.rocks_servers then cfg.rocks_servers = nil end
+   -- perform actual merge
+   util.deep_merge(cfg, overrides)
+end
 
 sys_config_file = site_config.LUAROCKS_SYSCONFIG or sys_config_dir.."/config-"..cfg.lua_version..".lua"
 do
    local err, errcode
-   sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, env_for_config_file)
+   sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, env_for_config_file())
    if (not sys_config_ok) and errcode == "open" then -- file not found, so try alternate file
       sys_config_file = sys_config_dir.."/config.lua"
-      sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, env_for_config_file)
+      sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, env_for_config_file())
    end
    if (not sys_config_ok) and errcode ~= "open" then -- either "load" or "run"; bad config file, bail out with error
       io.stderr:write(err.."\n")
       os.exit(cfg.errorcodes.CONFIGFILE)
    end
+   if sys_config_ok then 
+      merge_overrides(sys_config_ok)
+   end
 end
 
 if not site_config.LUAROCKS_FORCE_CONFIG then
@@ -179,24 +197,18 @@ if not site_config.LUAROCKS_FORCE_CONFIG then
    local home_overrides, err, errcode
    home_config_file = os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG")
    if home_config_file then
-      home_overrides, err, errcode = persist.load_into_table(home_config_file, env_for_config_file)
+      home_overrides, err, errcode = persist.load_into_table(home_config_file, env_for_config_file())
    else
       home_config_file = home_config_dir.."/config-"..cfg.lua_version..".lua"
-      home_overrides, err, errcode = persist.load_into_table(home_config_file, env_for_config_file)
+      home_overrides, err, errcode = persist.load_into_table(home_config_file, env_for_config_file())
       if (not home_overrides) and (not errcode == "run") then
          home_config_file = home_config_dir.."/config.lua"
-         home_overrides, err, errcode = persist.load_into_table(home_config_file, env_for_config_file)
+         home_overrides, err, errcode = persist.load_into_table(home_config_file, env_for_config_file())
       end
    end
    if home_overrides then
       home_config_ok = true
-      if home_overrides.rocks_trees then
-         cfg.rocks_trees = nil
-      end
-      if home_overrides.rocks_servers then
-         cfg.rocks_servers = nil
-      end
-      util.deep_merge(cfg, home_overrides)
+      merge_overrides(home_overrides)
    else
       home_config_ok = home_overrides
       if errcode ~= "open" then
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 6fecf863..c06c8354 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -118,6 +118,7 @@ local supported_flags = {
    ["rock-tree"] = true,
    ["rock-trees"] = true,
    ["rockspec"] = true,
+   ["rockspec-format"] = "<ver>",
    ["server"] = "<server>",
    ["skip-pack"] = true,
    ["source"] = true,
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 68942e07..972562c3 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -24,18 +24,19 @@ If a repository URL is given with no version, it creates an 'scm' rock.
 Note that the generated file is a _starting point_ for writing a
 rockspec, and is not guaranteed to be complete or correct.
 
---output=<file>       Write the rockspec with the given filename.
-                      If not given, a file is written in the current
-                      directory with a filename based on given name and version.
---license="<string>"  A license string, such as "MIT/X11" or "GNU GPL v3".
---summary="<txt>"     A short one-line description summary.
---detailed="<txt>"    A longer description string.
---homepage=<url>      Project homepage.
---lua-version=<ver>   Supported Lua versions. Accepted values are "5.1", "5.2",
-                      "5.3", "5.1,5.2", "5.2,5.3", or "5.1,5.2,5.3".
---tag=<tag>           Tag to use. Will attempt to extract version number from it.
---lib=<lib>[,<lib>]   A comma-separated list of libraries that C files need to
-                      link to.
+--output=<file>          Write the rockspec with the given filename.
+                         If not given, a file is written in the current
+                         directory with a filename based on given name and version.
+--license="<string>"     A license string, such as "MIT/X11" or "GNU GPL v3".
+--summary="<txt>"        A short one-line description summary.
+--detailed="<txt>"       A longer description string.
+--homepage=<url>         Project homepage.
+--lua-version=<ver>      Supported Lua versions. Accepted values are "5.1", "5.2",
+                         "5.3", "5.1,5.2", "5.2,5.3", or "5.1,5.2,5.3".
+--rockspec-format=<ver>  Rockspec format version, such as "1.0" or "1.1".
+--tag=<tag>              Tag to use. Will attempt to extract version number from it.
+--lib=<lib>[,<lib>]      A comma-separated list of libraries that C files need to
+                         link to.
 ]]
 
 local function open_file(name)
@@ -246,6 +247,7 @@ function write_rockspec.run(...)
    end
 
    local rockspec = {
+      rockspec_format = flags["rockspec-format"],
       package = name,
       name = name:lower(),
       version = version.."-1",
diff --git a/test/testing.lua b/test/testing.lua
index 44c6f098..48d4ac0e 100644
--- a/test/testing.lua
+++ b/test/testing.lua
@@ -400,6 +400,7 @@ local tests = {
    end,   
    test_write_rockspec = function() return run "$luarocks write_rockspec git://github.com/keplerproject/luarocks" end,
    test_write_rockspec_lib = function() return run '$luarocks write_rockspec git://github.com/mbalmer/luafcgi --lib=fcgi --license="3-clause BSD" --lua-version=5.1,5.2' end,
+   test_write_rockspec_format = function() return run '$luarocks write_rockspec git://github.com/keplerproject/luarocks --rockspec-format=1.1 --lua-version=5.1,5.2' end,
    test_write_rockspec_fullargs = function() return run '$luarocks write_rockspec git://github.com/keplerproject/luarocks --lua-version=5.1,5.2 --license="MIT/X11" --homepage="http://www.luarocks.org" --summary="A package manager for Lua modules"' end,
    fail_write_rockspec_args = function() return run "$luarocks write_rockspec invalid" end,
    fail_write_rockspec_args_url = function() return run "$luarocks write_rockspec http://example.com/invalid.zip" end,
diff --git a/test/testing.sh b/test/testing.sh
index 4338e48f..c43b4d52 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -492,6 +492,7 @@ test_deps_mode_make_order_sys() { $luarocks build --tree="$testing_tree" lpeg &&
 
 test_write_rockspec() { $luarocks write_rockspec git://github.com/keplerproject/luarocks; }
 test_write_rockspec_lib() { $luarocks write_rockspec git://github.com/mbalmer/luafcgi --lib=fcgi --license="3-clause BSD" --lua-version=5.1,5.2; }
+test_write_rockspec_format() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --rockspec-format=1.1 --lua-version=5.1,5.2; }
 test_write_rockspec_fullargs() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --lua-version=5.1,5.2 --license="MIT/X11" --homepage="http://www.luarocks.org" --summary="A package manager for Lua modules"; }
 fail_write_rockspec_args() { $luarocks write_rockspec invalid; }
 fail_write_rockspec_args_url() { $luarocks write_rockspec http://example.com/invalid.zip; }