diff options
author | Peter Melnichenko <mpeterval@gmail.com> | 2018-03-15 22:13:39 +0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-05-25 13:21:01 -0300 |
commit | 2478fb2d24aa8a5fc02debb24dbd2cd2c844cc94 (patch) | |
tree | c4ff3069b79a1b37be10c81df9bba054b1cb5314 | |
parent | a6778a07c6669a3a4c15d628d2a2aea453290170 (diff) | |
download | luarocks-2478fb2d24aa8a5fc02debb24dbd2cd2c844cc94.tar.gz luarocks-2478fb2d24aa8a5fc02debb24dbd2cd2c844cc94.tar.bz2 luarocks-2478fb2d24aa8a5fc02debb24dbd2cd2c844cc94.zip |
Update install.bat for 5.4 support
-rw-r--r-- | install.bat | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/install.bat b/install.bat index 09cf9aa2..0ca8639f 100644 --- a/install.bat +++ b/install.bat | |||
@@ -127,7 +127,7 @@ Configuring the destinations: | |||
127 | if you create a self contained installation. | 127 | if you create a self contained installation. |
128 | 128 | ||
129 | Configuring the Lua interpreter: | 129 | Configuring the Lua interpreter: |
130 | /LV [version] Lua version to use; either 5.1, 5.2, or 5.3. | 130 | /LV [version] Lua version to use; either 5.1, 5.2, 5.3, or 5.4. |
131 | Default is auto-detected. | 131 | Default is auto-detected. |
132 | /LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ | 132 | /LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ |
133 | If not provided, the installer will search the system | 133 | If not provided, the installer will search the system |
@@ -250,8 +250,8 @@ local function check_flags() | |||
250 | die("Bundled Lua version is 5.1, cannot install "..vars.LUA_VERSION) | 250 | die("Bundled Lua version is 5.1, cannot install "..vars.LUA_VERSION) |
251 | end | 251 | end |
252 | end | 252 | end |
253 | if not vars.LUA_VERSION:match("^5%.[123]$") then | 253 | if not vars.LUA_VERSION:match("^5%.[1234]$") then |
254 | die("Bad argument: /LV must either be 5.1, 5.2, or 5.3") | 254 | die("Bad argument: /LV must either be 5.1, 5.2, 5.3, or 5.4") |
255 | end | 255 | end |
256 | if USE_MSVC_MANUAL and USE_MINGW then | 256 | if USE_MSVC_MANUAL and USE_MINGW then |
257 | die("Cannot combine option /MSVC and /MW") | 257 | die("Cannot combine option /MSVC and /MW") |
@@ -269,7 +269,7 @@ local function detect_lua_version(interpreter_path) | |||
269 | local full_version = handler:read("*a") | 269 | local full_version = handler:read("*a") |
270 | handler:close() | 270 | handler:close() |
271 | 271 | ||
272 | local version = full_version:match(" (5%.[123])$") | 272 | local version = full_version:match(" (5%.[1234])$") |
273 | if not version then | 273 | if not version then |
274 | return nil, "unknown interpreter version '" .. full_version .. "'" | 274 | return nil, "unknown interpreter version '" .. full_version .. "'" |
275 | end | 275 | end |
@@ -281,7 +281,7 @@ local function look_for_interpreter(directory) | |||
281 | if lua_version_set then | 281 | if lua_version_set then |
282 | names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe"} | 282 | names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe"} |
283 | else | 283 | else |
284 | names = {"lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"} | 284 | names = {"lua5.4.exe", "lua54.exe", "lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"} |
285 | end | 285 | end |
286 | table.insert(names, "lua.exe") | 286 | table.insert(names, "lua.exe") |
287 | table.insert(names, "luajit.exe") | 287 | table.insert(names, "luajit.exe") |