Merge pull request #130 from Tieske/auto_detect_runtime

Win installer update; auto detect runtime

2 files changed, 75 insertions, 10 deletions

diff --git a/install.bat b/install.bat
index 2150d2c3..e1e7cb76 100644
--- a/install.bat
+++ b/install.bat
@@ -18,6 +18,7 @@ vars.LUA_LIBNAME = nil
 vars.LUA_VERSION = "5.1"

 vars.LUA_SHORTV = nil

 vars.LUA_LIB_NAMES = "lua5.1.lib lua51.dll liblua.dll.a"

+vars.LUA_RUNTIME = nil

 

 local P_SET = false

 local FORCE = false

@@ -263,6 +264,66 @@ local function look_for_headers (directory)
         return false

 end

 

+-- Checks a binary file for the runtime dll used by it. If nu runtime is found, it returns an

+-- array of dll's is depends upon.

+-- result: string = runtime used, table = list of dll's depended upon, nil = nothing found.

+local function get_file_runtime(p,f) -- path, filename

+        local infile = p.."\\"..f

+        local outfile = "output.txt"

+        local content

+        -- analyze binary

+        if exec([[.\bin\objdump -x "]]..infile..[[" > ]]..outfile) then

+                -- read temp file

+                local fh = io.open(outfile)

+                content = fh:read("*a")

+                fh:close()

+        end

+        -- delete temp file

+        os.remove(outfile)

+        if not content then

+                print("    Failed to analyze "..infile.." for the runtime used")

+        return nil

+    end

+

+        -- lookup

+        content = content:upper()

+        local result = content:match('DLL NAME%: (MSVCR%d*)%.DLL')

+        if not result then

+          result = content:match('DLL NAME%: (MSVCRT)%.DLL')

+        end

+

+        if result then

+                print("    "..f.." uses "..tostring(result)..".DLL as runtime")

+        else

+                print("    No runtime found for "..f)

+                -- so; create a list of dll's this file is depending upon, next level of the tree

+                result = {}

+                for name in content:gmatch("DLL NAME%: (.-%.DLL)") do

+                        --print("found dll:", name)

+                        table.insert(result, name)

+                end

+        end

+        return result

+end

+

+local function get_runtime()

+        -- first check interpreter

+        vars.LUA_RUNTIME = get_file_runtime(vars.LUA_BINDIR, vars.LUA_INTERPRETER)

+        if type(vars.LUA_RUNTIME) == "table" then

+                -- a table with dll's depended upon was returned, check this list

+                -- note: we only check 1 level deep

+                for _,dll in ipairs(vars.LUA_RUNTIME) do

+                        local t = get_file_runtime(vars.LUA_BINDIR, dll)

+                        if type(t) == "string" then

+                                -- found it

+                                vars.LUA_RUNTIME = t

+                                break

+                        end

+                end

+        end

+        return (type(vars.LUA_RUNTIME) == "string")

+end

+

 local function look_for_lua_install ()

         print("Looking for Lua interpreter")

         local directories = { [[c:\lua5.1.2]], [[c:\lua]], [[c:\kepler\1.1]] }

@@ -275,7 +336,7 @@ local function look_for_lua_install ()
                         look_for_headers(vars.LUA_INCDIR)

                 then

                         if exec(S"$LUA_BINDIR\\$LUA_INTERPRETER -v 2>NUL") then

-                                print("   Ok")

+                                print("    Ok")

                                 return true

                         end

                 end

@@ -290,12 +351,15 @@ local function look_for_lua_install ()
                                 if look_for_link_libraries(directory) then

                                         print("Link library found, now looking for headers...")

                                         if look_for_headers(directory) then

-                                                print("Headers found, now testing interpreter...")

-                                                if exec(S[[$LUA_BINDIR\$LUA_INTERPRETER -v 2>NUL]]) then

-                                                        print("   Ok")

-                                                        return true

+                                                print("Headers found, checking runtime to use...")

+                                                if get_runtime() then

+                                                        print("Runtime found, 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")

                                                 end

-                                                print("   Interpreter returned an error, not ok")

                                         end

                                 end

                         end

@@ -358,6 +422,7 @@ if not look_for_lua_install() then
         vars.LUA_LIBDIR = vars.LIBDIR

         vars.LUA_INCDIR = vars.INCDIR

         vars.LUA_LIBNAME = "lua5.1.lib"

+    vars.LUA_RUNTIME = "MSVCR80"

 else

         print(S[[

 

@@ -367,7 +432,7 @@ Lua interpreter: $LUA_BINDIR\$LUA_INTERPRETER
 Lua binaries   : $LUA_BINDIR

 Lua libraries  : $LUA_LIBDIR

 Lua includes   : $LUA_INCDIR

-Binaries will be linked against: $LUA_LIBNAME

+Binaries will be linked against: $LUA_LIBNAME with runtime $LUA_RUNTIME

 

 ]])

 end

@@ -521,10 +586,10 @@ rocks_trees = {
                 f:write(S"scripts_dir=[[$SCRIPTS_DIR]]\n")

         end

         f:write("variables = {\n")

-        if USE_MINGW then

-                f:write("    MSVCRT = 'm',\n")

+        if USE_MINGW and vars.LUA_RUNTIME == "MSVCRT" then

+                f:write("    MSVCRT = 'm',   -- make MinGW use MSVCRT.DLL as runtime\n")

         else

-                f:write("    MSVCRT = 'msvcr80',\n")

+                f:write("    MSVCRT = '"..vars.LUA_RUNTIME.."',\n")

         end

         f:write(S"    LUALIB = '$LUA_LIBNAME'\n")

         f:write("}\n")

diff --git a/win32/bin/objdump.exe b/win32/bin/objdump.exe
new file mode 100644
index 00000000..4429d103
--- /dev/null
+++ b/win32/bin/objdump.exe