Merge branch 'master' of github.com:Tieske/luarocks into win_install_checkpath

Conflicts:
	install.bat

4 files changed, 66 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index b2701aa3..8933d8aa 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ install_bins: built
         cd src/bin && for f in $(BIN_FILES); \
         do \
            cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \
-           ln -nfs "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \
+           ln -nfs "$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \
         done
 
 install_luas: built
diff --git a/install.bat b/install.bat
index c085de40..d234e242 100644
--- a/install.bat
+++ b/install.bat
@@ -91,42 +91,49 @@ local function print_help()
         print(S[[

 Installs LuaRocks.

 

-/P [dir]       (REQUIRED) Where to install. 

-               Note that version; $VERSION, will be

-               appended to this path.

-/CONFIG [dir]  Location where the config file should be installed.

-               Default is same place of installation

+/P [dir]       (REQUIRED) Where to install LuaRocks. 

+               Note that version; $VERSION, will be appended to this

+               path, so "/P c:\luarocks\" will install in 

+               "c:\luarocks\$VERSION\"

+

+Configuring the destinations:

 /TREE [dir]    Root of the local tree of installed rocks.

                Default is same place of installation

-/SCRIPTS [dir] Where to install scripts installed by rocks.

-               Default is TREE/bin.

+/SCRIPTS [dir] Where to install commandline scripts installed by

+               rocks. Default is TREE/bin.

 

+Configuring the Lua interpreter:

 /LV [version]  Lua version to use; either 5.1 or 5.2.

                Default is 5.1

-/L             Install LuaRocks' own copy of Lua even if detected,

-               this will always be a 5.1 installation.

-               (/LUA, /INC, /LIB, /BIN cannot be used with /L)

 /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

+               installation.

                This is the base directory, the installer will look

                for subdirectories bin, lib, include. Alternatively

                these can be specified explicitly using the /INC,

                /LIB, and /BIN options.

 /INC [dir]     Location of Lua includes - e.g. c:\lua\5.1\include

                If provided overrides sub directory found using /LUA.

-/LIB [dir]     Location of Lua libraries -e.g. c:\lua\5.1\lib

+/LIB [dir]     Location of Lua libraries (.dll) - e.g. c:\lua\5.1\lib

                If provided overrides sub directory found using /LUA.

 /BIN [dir]     Location of Lua executables - e.g. c:\lua\5.1\bin

                If provided overrides sub directory found using /LUA.

+/L             Install LuaRocks' own copy of Lua even if detected,

+               this will always be a 5.1 installation.

+               (/LUA, /INC, /LIB, /BIN cannot be used with /L)

 

+Compiler configuration:

 /MW            Use mingw as build system instead of MSVC

 

+Other options:

+/CONFIG [dir]  Location where the config file should be installed.

+               Default is same place of installation

 /FORCECONFIG   Use a single config location. Do not use the

                LUAROCKS_CONFIG variable or the user's home directory.

                Useful to avoid conflicts when LuaRocks

                is embedded within an application.

-

 /F             Remove installation directory if it already exists.

-

 /R             Load registry information to register '.rockspec'

                extension with LuaRocks commands (right-click).

 

@@ -224,7 +231,7 @@ local function look_for_interpreter (directory)
                         print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")

                         return true

                 end

-                die(S"Lua executable lua.exe, luajit.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")

+                die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")

         end

 

         for _, e in ipairs{ [[\]], [[\bin\]] } do

@@ -307,31 +314,31 @@ end
 

 

 local function get_runtime()

-    local f

+        local f

         vars.LUA_RUNTIME, f = pe.msvcrt(vars.LUA_BINDIR.."\\"..vars.LUA_INTERPRETER)

         if type(vars.LUA_RUNTIME) ~= "string" then

                 -- analysis failed, issue a warning

                 vars.LUA_RUNTIME = "MSVCR80"

                 print("*** WARNING ***: could not analyse the runtime used, defaulting to "..vars.LUA_RUNTIME)

-    else

+        else

                 print("    "..f.." uses "..vars.LUA_RUNTIME..".DLL as runtime")

         end

         return true

 end

 

 local function get_architecture()

-    -- detect processor arch interpreter was compiled for

-    local proc = (pe.parse(vars.LUA_BINDIR.."\\"..vars.LUA_INTERPRETER) or {}).Machine

-    if not proc then

-        die("Could not detect processor architecture used in "..vars.LUA_INTERPRETER)

-    end

-    proc = pe.const.Machine[proc]  -- collect name from constant value

-    if proc == "IMAGE_FILE_MACHINE_I386" then

-        proc = "x86"

-    else

-        proc = "x86_64"

-    end

-    return proc

+        -- detect processor arch interpreter was compiled for

+        local proc = (pe.parse(vars.LUA_BINDIR.."\\"..vars.LUA_INTERPRETER) or {}).Machine

+        if not proc then

+                die("Could not detect processor architecture used in "..vars.LUA_INTERPRETER)

+        end

+        proc = pe.const.Machine[proc]  -- collect name from constant value

+        if proc == "IMAGE_FILE_MACHINE_I386" then

+                proc = "x86"

+        else

+                proc = "x86_64"

+        end

+        return proc

 end

 

 local function look_for_lua_install ()

@@ -418,10 +425,34 @@ local with_arg = { -- options followed by an argument, others are flags
         ["/BIN"] = true,

         ["/LIB"] = true,

 }

+-- reconstruct argument values with spaces and double quotes

+-- this will be damaged by the batch construction at the start of this file

+if #arg > 0 then

+        farg = table.concat(arg, " ") .. " "

+        arg = {}

+        farg = farg:gsub('%"', "")

+        local i = 0

+        while #farg>0 do

+                i = i + 1

+                if (farg:sub(1,1) ~= "/") and ((arg[i-1] or ""):sub(1,1) ~= "/") then

+                        i = i - 1       -- continued previous arg

+                        if i == 0 then i = 1 end

+                end

+                if arg[i] then

+                        arg[i] = arg[i] .. " "

+                else

+                        arg[i] = ""

+                end

+                local v,r = farg:match("^(.-)%s(.*)$")

+                arg[i], farg = arg[i]..v, r

+                while farg:sub(1,1) == " " do farg = farg:sub(2,-1) end -- remove prefix spaces

+        end

+end

+

 local i = 1

 while i <= #arg do

         local opt = arg[i]

-        if with_arg[opt] then

+        if with_arg[opt:upper()] then

                 local value = arg[i + 1]

                 if not value then

                         die("Missing value for option "..opt)

@@ -448,15 +479,15 @@ vars.LUA_SHORTV = vars.LUA_VERSION:gsub("%.", "")
 

 if INSTALL_LUA then

         if vars.LUA_VERSION ~= "5.1" then

-                die("Cannot install own copy because no 5.2 version is bundled")

+                die("Cannot install own copy of Lua because only 5.1 is bundled")

         end

         vars.LUA_INTERPRETER = "lua5.1"

         vars.LUA_BINDIR = vars.BINDIR

         vars.LUA_LIBDIR = vars.LIBDIR

         vars.LUA_INCDIR = vars.INCDIR

         vars.LUA_LIBNAME = "lua5.1.lib"

-    vars.LUA_RUNTIME = "MSVCR80"

-    vars.UNAME_M = "x86"

+        vars.LUA_RUNTIME = "MSVCR80"

+        vars.UNAME_M = "x86"

 else

         if not look_for_lua_install() then

                 die("Could not find Lua. See /? for options for specifying the location of Lua, or installing a bundled copy of Lua 5.1.")

diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index f1737876..0df3a921 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -22,7 +22,7 @@ function run(rockspec)
 
    util.variable_substitutions(variables, rockspec.variables)
 
-   if not fs.execute_quiet(rockspec.variables.CMAKE, "--help")) then
+   if not fs.execute_quiet(rockspec.variables.CMAKE, "--help") then
       return nil, "'"..rockspec.variables.CMAKE.."' program not found. Is cmake installed? You may want to edit variables.CMAKE"
    end
    
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua
index a116766c..aa3b2781 100644
--- a/src/luarocks/loader.lua
+++ b/src/luarocks/loader.lua
@@ -108,7 +108,7 @@ end
 -- @return table or (nil, string): The module table as returned by some other loader,
 -- or nil followed by an error message if no other loader managed to load the module.
 local function call_other_loaders(module, name, version, module_name)
-   for i, loader in pairs(package.loaders) do
+   for i, loader in ipairs(package.loaders) do
       if loader ~= luarocks_loader then
          local results = { loader(module_name) }
          if type(results[1]) == "function" then