From e3c6073f5912d3fd9d098783483a63bf39610fb3 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 18:26:53 +0300 Subject: Refactor look_for_interpreter in install.bat Replace repeating code with loops. The only side effect should be that LUA_BINDIR now does not have trailing backslash when it's inferred. --- install.bat | 66 ++++++++++++++++++++----------------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/install.bat b/install.bat index cc4a5257..1bce4c53 100644 --- a/install.bat +++ b/install.bat @@ -287,56 +287,32 @@ end -- *********************************************************** -- Detect Lua -- *********************************************************** -local function look_for_interpreter (directory) +local function look_for_interpreter(directory) + local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"} + local directories if vars.LUA_BINDIR then - -- if LUA_BINDIR is specified, it must be there, otherwise we fail - if exists( S"$LUA_BINDIR\\lua$LUA_VERSION.exe" ) then - vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - elseif exists( S"$LUA_BINDIR\\lua$LUA_SHORTV.exe" ) then - vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - elseif exists(S"$LUA_BINDIR\\lua.exe") then - vars.LUA_INTERPRETER = "lua.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - elseif exists(S"$LUA_BINDIR\\luajit.exe") then - vars.LUA_INTERPRETER = "luajit.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - end - die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR") + -- If LUA_BINDIR is specified, look only in that directory. + directories = {vars.LUA_BINDIR} + else + -- Try candidate directory and its `bin` subdirectory. + directories = {directory, directory .. "\\bin"} end - for _, e in ipairs{ [[\]], [[\bin\]] } do - if exists(directory..e.."\\lua"..vars.LUA_VERSION..".exe") then - vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe" - vars.LUA_BINDIR = directory .. e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true - - elseif exists(directory..e.."\\lua"..vars.LUA_SHORTV..".exe") then - vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe" - vars.LUA_BINDIR = directory .. e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true - - elseif exists(directory..e.."\\lua.exe") then - vars.LUA_INTERPRETER = "lua.exe" - vars.LUA_BINDIR = directory..e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true - - elseif exists(directory..e.."\\luajit.exe") then - vars.LUA_INTERPRETER = "luajit.exe" - vars.LUA_BINDIR = directory..e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true + for _, dir in ipairs(directories) do + for _, name in ipairs(names) do + local full_name = dir .. "\\" .. name + if exists(full_name) then + vars.LUA_INTERPRETER = name + vars.LUA_BINDIR = dir + print(" Found " .. full_name) + return true + end end end - --print(" No Lua interpreter found") + + if vars.LUA_BINDIR then + die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR") + end return false end -- cgit v1.2.3-55-g6feb From 1adda57f6d311e181998918ce27bdd5bd743975e Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 18:36:25 +0300 Subject: Refactor look_for_link_libraries in install.bat One side effect should be that inferred LIB_DIR has no trailing backslash. --- install.bat | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/install.bat b/install.bat index 1bce4c53..0f377d8d 100644 --- a/install.bat +++ b/install.bat @@ -316,30 +316,30 @@ local function look_for_interpreter(directory) return false end -local function look_for_link_libraries (directory) +local function look_for_link_libraries(directory) + local directories if vars.LUA_LIBDIR then - for name in vars.LUA_LIB_NAMES:gmatch("[^%s]+") do - print(S" checking for $LUA_LIBDIR\\"..name) - if exists(vars.LUA_LIBDIR.."\\"..name) then - vars.LUA_LIBNAME = name - print(" Found "..name) - return true - end - end - die(S"link library (one of; $LUA_LIB_NAMES) not found in $LUA_LIBDIR") + directories = {vars.LUA_LIBDIR} + else + directories = {directory, directory .. "\\lib", directory .. "\\bin"} end - for _, e in ipairs{ [[\]], [[\lib\]], [[\bin\]]} do + for _, dir in ipairs(directories) do for name in vars.LUA_LIB_NAMES:gmatch("[^%s]+") do - print(" checking for "..directory..e.."\\"..name) - if exists(directory..e.."\\"..name) then - vars.LUA_LIBDIR = directory .. e + local full_name = dir .. "\\" .. name + print(" checking for " .. full_name) + if exists(full_name) then + vars.LUA_LIBDIR = dir vars.LUA_LIBNAME = name - print(" Found "..name) + print(" Found " .. name) return true end end end + + if vars.LUA_LIBDIR then + die(S"link library (one of; $LUA_LIB_NAMES) not found in $LUA_LIBDIR") + end return false end -- cgit v1.2.3-55-g6feb From 285bf935d0cf7fe12640d788b29fa092027a8d60 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 18:49:21 +0300 Subject: Refactor look_for_headers in install.bat One side effect should be that LUA_INCDIR does not have trailing backslash when inferred. --- install.bat | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/install.bat b/install.bat index 0f377d8d..41474c47 100644 --- a/install.bat +++ b/install.bat @@ -343,31 +343,33 @@ local function look_for_link_libraries(directory) return false end -local function look_for_headers (directory) +local function look_for_headers(directory) + local directories if vars.LUA_INCDIR then - print(S" checking for $LUA_INCDIR\\lua.h") - if exists(S"$LUA_INCDIR\\lua.h") then - print(" Found lua.h") - return true - end - die(S"lua.h not found in $LUA_INCDIR") + directories = {vars.LUA_INCDIR} + else + directories = { + directory .. S"\\include\\lua\\$LUA_VERSION", + directory .. S"\\include\\lua$LUA_SHORTV", + directory .. S"\\include\\lua$LUA_VERSION", + directory .. "\\include", + directory + } end - for _, e in ipairs{ - S([[\include\lua\$LUA_VERSION]]), - S([[\include\lua$LUA_SHORTV]]), - S([[\include\lua$LUA_VERSION]]), - S([[\include\$LUA_VERSION]]), - [[\include\]], - [[\]], - } do - print(" checking for "..directory..e.."\\lua.h") - if exists(directory..e.."\\lua.h") then - vars.LUA_INCDIR = directory..e + for _, dir in ipairs(directories) do + local full_name = dir .. "\\lua.h" + print(" checking for " .. full_name) + if exists(full_name) then + vars.LUA_INCDIR = dir print(" Found lua.h") return true end end + + if vars.LUA_INCDIR then + die(S"lua.h not found in $LUA_INCDIR") + end return false end -- cgit v1.2.3-55-g6feb From 112342feb7f6da3b04251f29fd75bb2eb7c26a97 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 19:08:14 +0300 Subject: Split look_for_lua_install in install.bat Move gathering of potential lua directories into a separate function, call it only when needed. --- install.bat | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/install.bat b/install.bat index 41474c47..32988022 100644 --- a/install.bat +++ b/install.bat @@ -526,33 +526,33 @@ local function get_msvc_env_setup_cmd() return "" end -local function look_for_lua_install () - print("Looking for Lua interpreter") - local directories +local function get_possible_lua_directories() if vars.LUA_PREFIX then - directories = { vars.LUA_PREFIX } - else - -- no prefix given, so use path - directories = (os.getenv("PATH",";") or "") - directories = directories:gsub(";+", ";") --remove all doubles - directories = split_string(directories,";") - -- if a path element ends with "\bin\" then remove it, as the searcher will check there anyway - for i, val in ipairs(directories) do - -- remove trailing backslash - while val:sub(-1,-1) == "\\" and val:sub(-2,-1) ~= ":\\" do - val = val:sub(1,-2) - end - -- remove trailing 'bin' - if val:upper():sub(-4,-1) == "\\BIN" or val:upper():sub(-4,-1) == ":BIN" then - val = val:sub(1,-5) - end - directories[i] = val + return {vars.LUA_PREFIX} + end + + -- No prefix given, so use PATH. + local path = os.getenv("PATH") or "" + path = path:gsub(";+", ";") -- Remove duplicates. + local directories = split_string(path, ";") + for i, dir in ipairs(directories) do + -- Remove trailing backslashes, but not from a drive letter like `C:\`. + dir = dir:gsub("([^:])\\+$", "%1") + -- Remove trailing `bin` subdirectory, the searcher will check there anyway. + if dir:upper():match("[:\\]BIN$") then + dir = dir:sub(1, -5) end - -- finaly add some other default paths - table.insert(directories, [[c:\lua5.1.2]]) - table.insert(directories, [[c:\lua]]) - table.insert(directories, [[c:\kepler\1.1]]) + directories[i] = dir end + -- Finally add some other default paths. + table.insert(directories, [[c:\lua5.1.2]]) + table.insert(directories, [[c:\lua]]) + table.insert(directories, [[c:\kepler\1.1]]) + return directories +end + +local function look_for_lua_install () + print("Looking for Lua interpreter") if vars.LUA_BINDIR and vars.LUA_LIBDIR and vars.LUA_INCDIR then if look_for_interpreter(vars.LUA_BINDIR) and look_for_link_libraries(vars.LUA_LIBDIR) and @@ -569,8 +569,8 @@ local function look_for_lua_install () end return false end - - for _, directory in ipairs(directories) do + + for _, directory in ipairs(get_possible_lua_directories()) do print(" checking " .. directory) if exists(directory) then if look_for_interpreter(directory) then -- cgit v1.2.3-55-g6feb From ecfdd47e1b627e916692affe6ea93ba0ac6d4ac8 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 23:48:23 +0300 Subject: Autodetect Lua version in install.bat --- install.bat | 69 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/install.bat b/install.bat index 32988022..c95967a6 100644 --- a/install.bat +++ b/install.bat @@ -42,6 +42,8 @@ local NOADMIN = false local PROMPT = true local SELFCONTAINED = false +local lua_version_set = false + --- -- Some helpers -- @@ -220,6 +222,7 @@ local function parse_options(args) vars.TREE_CMODULE = option.value elseif name == "/LV" then vars.LUA_VERSION = option.value + lua_version_set = true elseif name == "/L" then INSTALL_LUA = true elseif name == "/MW" then @@ -287,8 +290,31 @@ end -- *********************************************************** -- Detect Lua -- *********************************************************** +local function detect_lua_version(interpreter_path) + local handler = io.popen(('type NUL && "%s" -e "io.stdout:write(_VERSION)" 2>NUL'):format(interpreter_path), "r") + if not handler then + return nil, "interpreter does not work" + end + local full_version = handler:read("*a") + handler:close() + + local version = full_version:match("^Lua (5%.[123])$") + if not version then + return nil, "unknown interpreter version '" .. full_version .. "'" + end + return version +end + local function look_for_interpreter(directory) - local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"} + local names + if lua_version_set then + names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe"} + else + names = {"lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"} + end + table.insert(names, "lua.exe") + table.insert(names, "luajit.exe") + local directories if vars.LUA_BINDIR then -- If LUA_BINDIR is specified, look only in that directory. @@ -302,16 +328,31 @@ local function look_for_interpreter(directory) for _, name in ipairs(names) do local full_name = dir .. "\\" .. name if exists(full_name) then - vars.LUA_INTERPRETER = name - vars.LUA_BINDIR = dir - print(" Found " .. full_name) - return true + print(" Found " .. name .. ", testing it...") + local version, err = detect_lua_version(full_name) + if not version then + print(" Error: " .. err) + else + if version ~= vars.LUA_VERSION then + if lua_version_set then + die("Version of interpreter clashes with the value of /LV. Please check your configuration.") + else + vars.LUA_VERSION = version + vars.LUA_SHORTV = version:gsub("%.", "") + vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)[123]", "5%1" .. version:sub(-1)) + end + end + + vars.LUA_INTERPRETER = name + vars.LUA_BINDIR = dir + return true + end end end end if vars.LUA_BINDIR then - die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR") + die(("Working Lua executable (one of %s) not found in %s"):format(table.concat(names, ", "), vars.LUA_BINDIR)) end return false end @@ -559,12 +600,8 @@ local function look_for_lua_install () look_for_headers(vars.LUA_INCDIR) then if get_runtime() then - print("Runtime check completed, now testing interpreter...") - if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then - print(" Ok") - return true - end - print(" Interpreter returned an error, not ok") + print("Runtime check completed.") + return true end end return false @@ -580,12 +617,8 @@ local function look_for_lua_install () if look_for_headers(directory) then print("Headers found, checking runtime to use...") if get_runtime() then - print("Runtime check completed, now testing interpreter...") - if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then - print(" Ok") - return true - end - print(" Interpreter returned an error, not ok") + print("Runtime check completed.") + return true end end end -- cgit v1.2.3-55-g6feb From d73b0db51368d6b6e9d9b6d1980b666906a442ad Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 22 Aug 2016 00:07:02 +0300 Subject: Update install.bat help message --- install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.bat b/install.bat index c95967a6..e28734dc 100644 --- a/install.bat +++ b/install.bat @@ -151,7 +151,7 @@ Configuring the destinations: Configuring the Lua interpreter: /LV [version] Lua version to use; either 5.1, 5.2, or 5.3. - Default is 5.1 + Default is auto-detected. /LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ If not provided, the installer will search the system path and some default locations for a valid Lua -- cgit v1.2.3-55-g6feb