Merge pull request #145 from Tieske/move_win_binaries

moved windows binaries into a 'bin' subdirectory.

23 files changed, 6 insertions, 5 deletions

diff --git a/install.bat b/install.bat
index 15f26070..8222454e 100644
--- a/install.bat
+++ b/install.bat
@@ -44,12 +44,12 @@ local function exec(cmd)
 end

 

 local function exists(filename)

-        local cmd = [[.\bin\test -e "]]..filename..[["]]

+        local cmd = [[.\bin\bin\test -e "]]..filename..[["]]

         return exec(cmd)

 end

 

 local function mkdir (dir)

-        return exec([[.\bin\mkdir -p "]]..dir..[[" >NUL]])

+        return exec([[.\bin\bin\mkdir -p "]]..dir..[[" >NUL]])

 end

 

 -- interpolate string with values from 'vars' table

@@ -272,7 +272,7 @@ local function get_file_runtime(p,f) -- path, filename
         local outfile = "output.txt"

         local content

         -- analyze binary

-        if exec([[.\bin\objdump -x "]]..infile..[[" > ]]..outfile..[[ 2<&1]]) then

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

                 -- read temp file

                 local fh = io.open(outfile)

                 content = fh:read("*a")

@@ -480,7 +480,7 @@ if INSTALL_LUA then
 end

 

 -- Copy the LuaRocks binaries

-if not exec(S[[COPY bin\*.* "$BINDIR" >NUL]]) then

+if not exec(S[[XCOPY /S bin\*.* "$BINDIR" >NUL]]) then

         die()

 end

 -- Copy the LuaRocks lua source files

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index df1be2bb..62c69597 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -296,7 +296,7 @@ if detected.windows then
       "MKDIR", "MV", "PWD", "RMDIR", "RM", "TEST", "UNAME", "WGET" }
    for _, var in ipairs(bins) do
       if defaults.variables[var] then
-         defaults.variables[var] = full_prefix.."\\"..defaults.variables[var]
+         defaults.variables[var] = full_prefix.."\\bin\\"..defaults.variables[var]
       end
    end
 
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 73798cbe..f60b8f5b 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -107,6 +107,7 @@ end
 -- @return boolean: true on success, false on failure.
 function make_dir(directory)
    assert(directory)
+   directory = dir.normalize(directory)
    fs.execute(fs.quiet(vars.MKDIR.." -p "..fs.Q(directory)))
    if not fs.is_dir(directory) then
       return false, "failed making directory "..directory
diff --git a/win32/bin/7z.dll b/win32/bin/7z.dll
deleted file mode 100644
index c0ff7fbe..00000000
--- a/win32/bin/7z.dll
+++ /dev/null
diff --git a/win32/bin/7z.exe b/win32/bin/7z.exe
deleted file mode 100644
index 5e3d6f9c..00000000
--- a/win32/bin/7z.exe
+++ /dev/null
diff --git a/win32/bin/chmod.exe b/win32/bin/chmod.exe
deleted file mode 100644
index 9655cfd6..00000000
--- a/win32/bin/chmod.exe
+++ /dev/null
diff --git a/win32/bin/cp.exe b/win32/bin/cp.exe
deleted file mode 100755
index 0ef4fe85..00000000
--- a/win32/bin/cp.exe
+++ /dev/null
diff --git a/win32/bin/find.exe b/win32/bin/find.exe
deleted file mode 100755
index 85192fbf..00000000
--- a/win32/bin/find.exe
+++ /dev/null
diff --git a/win32/bin/libeay32.dll b/win32/bin/libeay32.dll
deleted file mode 100644
index 8d31f866..00000000
--- a/win32/bin/libeay32.dll
+++ /dev/null
diff --git a/win32/bin/libiconv2.dll b/win32/bin/libiconv2.dll
deleted file mode 100644
index 544dd92f..00000000
--- a/win32/bin/libiconv2.dll
+++ /dev/null
diff --git a/win32/bin/libintl3.dll b/win32/bin/libintl3.dll
deleted file mode 100644
index ec11e6b1..00000000
--- a/win32/bin/libintl3.dll
+++ /dev/null
diff --git a/win32/bin/libssl32.dll b/win32/bin/libssl32.dll
deleted file mode 100644
index a30ff0e9..00000000
--- a/win32/bin/libssl32.dll
+++ /dev/null
diff --git a/win32/bin/ls.exe b/win32/bin/ls.exe
deleted file mode 100755
index 96ff2e57..00000000
--- a/win32/bin/ls.exe
+++ /dev/null
diff --git a/win32/bin/md5sum.exe b/win32/bin/md5sum.exe
deleted file mode 100644
index 4ae9f74f..00000000
--- a/win32/bin/md5sum.exe
+++ /dev/null
diff --git a/win32/bin/mkdir.exe b/win32/bin/mkdir.exe
deleted file mode 100755
index 83e57d97..00000000
--- a/win32/bin/mkdir.exe
+++ /dev/null
diff --git a/win32/bin/mv.exe b/win32/bin/mv.exe
deleted file mode 100755
index 9fb65bb9..00000000
--- a/win32/bin/mv.exe
+++ /dev/null
diff --git a/win32/bin/objdump.exe b/win32/bin/objdump.exe
deleted file mode 100644
index 4429d103..00000000
--- a/win32/bin/objdump.exe
+++ /dev/null
diff --git a/win32/bin/pwd.exe b/win32/bin/pwd.exe
deleted file mode 100755
index 7dd114de..00000000
--- a/win32/bin/pwd.exe
+++ /dev/null
diff --git a/win32/bin/rm.exe b/win32/bin/rm.exe
deleted file mode 100755
index 8e79306b..00000000
--- a/win32/bin/rm.exe
+++ /dev/null
diff --git a/win32/bin/rmdir.exe b/win32/bin/rmdir.exe
deleted file mode 100755
index 6a85c3c4..00000000
--- a/win32/bin/rmdir.exe
+++ /dev/null
diff --git a/win32/bin/test.exe b/win32/bin/test.exe
deleted file mode 100755
index 94c95f9e..00000000
--- a/win32/bin/test.exe
+++ /dev/null
diff --git a/win32/bin/uname.exe b/win32/bin/uname.exe
deleted file mode 100755
index 3e2f4cf8..00000000
--- a/win32/bin/uname.exe
+++ /dev/null
diff --git a/win32/bin/wget.exe b/win32/bin/wget.exe
deleted file mode 100644
index 54b372e6..00000000
--- a/win32/bin/wget.exe
+++ /dev/null