6 files changed, 35 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 81d24d24..dc9079b0 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ build_bins: cleanup_bins
            echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
            echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
            cat src/bin/$$f.bak >> src/bin/$$f ;\
-           chmod +x src/bin/$$f ;\
+           chmod +rx src/bin/$$f ;\
            rm -f src/bin/$$f.bak ;\
         done
 
@@ -117,7 +117,7 @@ cleanup_bins:
         do \
            mv src/bin/$$f src/bin/$$f.bak ;\
            sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
-           chmod +x src/bin/$$f ;\
+           chmod +rx src/bin/$$f ;\
            rm -f src/bin/$$f.bak ;\
         done
 
diff --git a/Makefile.install.inc b/Makefile.install.inc
index 02d40735..621d7cb2 100644
--- a/Makefile.install.inc
+++ b/Makefile.install.inc
@@ -8,7 +8,7 @@ install_bins:
         for f in $(BIN_FILES); \
         do \
            cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
-           chmod +x "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
+           chmod +rx "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
            ln -nfs "$$f-$$luaver" "$(DESTDIR)$(BINDIR)/$$f"; \
         done
 
diff --git a/install.bat b/install.bat
index df058585..dcd132ff 100644
--- a/install.bat
+++ b/install.bat
@@ -508,17 +508,30 @@ local function get_msvc_env_setup_cmd()
         -- 1. try visual studio command line tools

         local vcdir = get_visual_studio_directory()

         if vcdir then

-                -- 1.1. try vcvarsall.bat

-                local vcvarsall = vcdir .. 'vcvarsall.bat'

-                if exists(vcvarsall) then

-                        return ('call "%s"%s'):format(vcvarsall, x64 and ' amd64' or '')

+                local vcvars_bats = {

+                        x86 = {

+                                "bin\\vcvars32.bat", -- prefers native compiler

+                                "bin\\amd64_x86\\vcvarsamd64_x86.bat"-- then cross compiler

+                        },

+                        x86_64 = {

+                                "bin\\amd64\\vcvars64.bat", -- prefers native compiler

+                                "bin\\x86_amd64\\vcvarsx86_amd64.bat" -- then cross compiler

+                        }

+                }

+                assert(vcvars_bats[vars.UNAME_M], "vars.UNAME_M: only x86 and x86_64 are supported")

+                for _, bat in ipairs(vcvars_bats[vars.UNAME_M]) do

+                        local full_path = vcdir .. bat

+                        if exists(full_path) then

+                                return ('call "%s"'):format(full_path)

+                        end

                 end

 

-                -- 1.2. try vcvars32.bat / vcvars64.bat

-                local relative_path = x64 and "bin\\amd64\\vcvars64.bat" or "bin\\vcvars32.bat"

-                local full_path = vcdir .. relative_path

-                if exists(full_path) then

-                        return ('call "%s"'):format(full_path)

+                -- try vcvarsall.bat in case MS changes the undocumented bat files above.

+                -- but this way we don't konw if specified compiler is installed...

+                local vcvarsall = vcdir .. 'vcvarsall.bat'

+                if exists(vcvarsall) then

+                        local vcvarsall_args = { x86 = "", x86_64 = " amd64" }

+                        return ('call "%s"%s'):format(vcvarsall, vcvarsall_args[vars.UNAME_M])

                 end

         end

 

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 0e72ca85..5722deca 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -177,6 +177,14 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       return nil, "Rockspec error: build type not specified"
    end
 
+   if not build_only_deps then
+      local ok
+      ok, err, errcode = deps.check_external_deps(rockspec, "build")
+      if err then
+         return nil, err, errcode
+      end
+   end
+
    if deps_mode == "none" then
       util.printerr("Warning: skipping dependency checks.")
    else
@@ -193,12 +201,6 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       return name, version
    end   
 
-   local ok
-   ok, err, errcode = deps.check_external_deps(rockspec, "build")
-   if err then
-      return nil, err, errcode
-   end
-
    if repos.is_installed(name, version) then
       repos.delete_version(name, version)
    end
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 2e434b03..18573ae4 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -88,7 +88,7 @@ end
 function download.command(flags, name, version)
    assert(type(version) == "string" or not version)
    if type(name) ~= "string" and not flags["all"] then
-      return nil, "Argument missing, see help."
+      return nil, "Argument missing. "..util.see_help("download")
    end
    if not name then name, version = "", "" end
 
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 38851d36..d72fabaf 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -139,7 +139,7 @@ end
 -- successful, nil and an error message otherwise. exitcode is optionally returned.
 function remove.command(flags, name, version)
    if type(name) ~= "string" then
-      return nil, "Argument missing, see help."
+      return nil, "Argument missing. "..util.see_help("remove")
    end
    
    local deps_mode = flags["deps-mode"] or cfg.deps_mode