Merge branch 'Zash-lua54'

3 files changed, 13 insertions, 4 deletions

diff --git a/src/luarocks/cmd/write_rockspec.lua b/src/luarocks/cmd/write_rockspec.lua
index 88223857..53be404c 100644
--- a/src/luarocks/cmd/write_rockspec.lua
+++ b/src/luarocks/cmd/write_rockspec.lua
@@ -33,8 +33,9 @@ rockspec, and is not guaranteed to be complete or correct.
 --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".
+--lua-version=<ver>      Supported Lua versions.  Accepted values are: "5.1", "5.2",
+                         "5.3", "5.4", "5.1,5.2", "5.2,5.3", "5.3,5.4", "5.1,5.2,5.3",
+                         "5.2,5.3,5.4", or "5.1,5.2,5.3,5.4"
 --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
@@ -68,12 +69,20 @@ local function configure_lua_version(rockspec, luaver)
       table.insert(rockspec.dependencies, "lua ~> 5.2")
    elseif luaver == "5.3" then
       table.insert(rockspec.dependencies, "lua ~> 5.3")
+   elseif luaver == "5.4" then
+      table.insert(rockspec.dependencies, "lua ~> 5.4")
    elseif luaver == "5.1,5.2" then
       table.insert(rockspec.dependencies, "lua >= 5.1, < 5.3")
    elseif luaver == "5.2,5.3" then
       table.insert(rockspec.dependencies, "lua >= 5.2, < 5.4")
+   elseif luaver == "5.3,5.4" then
+      table.insert(rockspec.dependencies, "lua >= 5.3, < 5.5")
    elseif luaver == "5.1,5.2,5.3" then
       table.insert(rockspec.dependencies, "lua >= 5.1, < 5.4")
+   elseif luaver == "5.2,5.3,5.4" then
+      table.insert(rockspec.dependencies, "lua >= 5.2, < 5.5")
+   elseif luaver == "5.1,5.2,5.3,5.4" then
+      table.insert(rockspec.dependencies, "lua >= 5.1, < 5.5")
    else
       util.warning("Please specify supported Lua version with --lua-version=<ver>. "..util.see_help("write_rockspec"))
    end
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index f036aa44..834dba79 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -15,7 +15,7 @@ local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs,
 
 local cfg = {}
 
-cfg.lua_version = _VERSION:match(" (5%.[123])$") or "5.1"
+cfg.lua_version = _VERSION:match(" (5%.[1234])$") or "5.1"
 local version_suffix = cfg.lua_version:gsub("%.", "_")
 
 -- Load site-local global configurations
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 7fdefce0..ff36aa50 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -310,7 +310,7 @@ function util.variable_substitutions(tbl, vars)
 end
 
 function util.lua_versions()
-   local versions = { "5.1", "5.2", "5.3" }
+   local versions = { "5.1", "5.2", "5.3", "5.4" }
    local i = 0
    return function()
       i = i + 1