26 files changed, 18 insertions, 42 deletions

diff --git a/install.bat b/install.bat
index 6dc8cd02..85ef73f6 100644
--- a/install.bat
+++ b/install.bat
@@ -1,6 +1,6 @@
 rem=rem --[[

 @setlocal&  set luafile="%~f0" & if exist "%~f0.bat" set luafile="%~f0.bat"

-@lua5.1\bin\lua5.1.exe %luafile% %*&  exit /b ]]

+@win32\lua5.1\bin\lua5.1.exe %luafile% %*&  exit /b ]]

 

 local vars = {}

 

@@ -38,7 +38,7 @@ local SELFCONTAINED = false
 -- Some helpers

 -- 

 

-local pe = assert(loadfile(".\\bin\\pe-parser.lua"))()

+local pe = assert(loadfile(".\\win32\\pe-parser.lua"))()

 

 local function die(message)

         if message then print(message) end

@@ -80,12 +80,12 @@ local function exec(cmd)
 end

 

 local function exists(filename)

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

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

         return exec(cmd)

 end

 

 local function mkdir (dir)

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

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

 end

 

 -- does the current user have admin priviledges ( = elevated)

@@ -666,13 +666,22 @@ if INSTALL_LUA then
         if not exists(vars.LUA_INCDIR) then

                 mkdir(vars.LUA_INCDIR)

         end

-        exec(S[[COPY lua5.1\bin\*.* "$LUA_BINDIR" >NUL]])

-        exec(S[[COPY lua5.1\include\*.* "$LUA_INCDIR" >NUL]])

+        exec(S[[COPY win32\lua5.1\bin\*.* "$LUA_BINDIR" >NUL]])

+        exec(S[[COPY win32\lua5.1\include\*.* "$LUA_INCDIR" >NUL]])

         print(S"Installed the LuaRocks bundled Lua interpreter in $LUA_BINDIR")

 end

 

 -- Copy the LuaRocks binaries

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

+if not exists(S[[$BINDIR\tools]]) then

+        if not mkdir(S[[$BINDIR\tools]]) then

+                die()

+        end

+end

+if not exec(S[[COPY win32\tools\*.* "$BINDIR\tools" >NUL]]) then

+        die()

+end

+-- Copy LR bin helper files

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

         die()

 end

 -- Copy the LuaRocks lua source files

@@ -870,7 +879,7 @@ if REGISTRY then
         -- expand template with correct path information

         print()

         print([[Loading registry information for ".rockspec" files]])

-        exec( S[[lua5.1\bin\lua5.1.exe "$FULL_PREFIX\LuaRocks.reg.lua" "$FULL_PREFIX\LuaRocks.reg.template"]] )

+        exec( S[[win32\lua5.1\bin\lua5.1.exe "$FULL_PREFIX\LuaRocks.reg.lua" "$FULL_PREFIX\LuaRocks.reg.template"]] )

         exec( S[[regedit /S "$FULL_PREFIX\\LuaRocks.reg"]] )

 end

 

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 693cdbdb..59a17754 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -319,7 +319,7 @@ if detected.windows then
       "MKDIR", "MV", "PWD", "RMDIR", "TEST", "UNAME", "WGET" }
    for _, var in ipairs(bins) do
       if defaults.variables[var] then
-         defaults.variables[var] = full_prefix.."\\bin\\"..defaults.variables[var]
+         defaults.variables[var] = full_prefix.."\\tools\\"..defaults.variables[var]
       end
    end
 
diff --git a/win32/bin/LuaRocks.reg.lua b/win32/LuaRocks.reg.lua
index 2eb7583a..2eb7583a 100644
--- a/win32/bin/LuaRocks.reg.lua
+++ b/win32/LuaRocks.reg.lua
diff --git a/win32/bin/LuaRocks.reg.template b/win32/LuaRocks.reg.template
index 82cc180f..82cc180f 100644
--- a/win32/bin/LuaRocks.reg.template
+++ b/win32/LuaRocks.reg.template
diff --git a/win32/bin/lua.ico b/win32/lua.ico
index 56dc4fe1..56dc4fe1 100644
--- a/win32/bin/lua.ico
+++ b/win32/lua.ico
diff --git a/win32/bin/luarocksw.bat b/win32/luarocksw.bat
index 8ac02920..8ac02920 100644
--- a/win32/bin/luarocksw.bat
+++ b/win32/luarocksw.bat
diff --git a/win32/bin/pe-parser.lua b/win32/pe-parser.lua
index 30bb8390..30bb8390 100644
--- a/win32/bin/pe-parser.lua
+++ b/win32/pe-parser.lua
diff --git a/win32/bin/rclauncher.c b/win32/rclauncher.c
index 77459f46..77459f46 100644
--- a/win32/bin/rclauncher.c
+++ b/win32/rclauncher.c
diff --git a/win32/bin/bin/7z.dll b/win32/tools/7z.dll
index c0ff7fbe..c0ff7fbe 100644
--- a/win32/bin/bin/7z.dll
+++ b/win32/tools/7z.dll
diff --git a/win32/bin/bin/7z.exe b/win32/tools/7z.exe
index 5e3d6f9c..5e3d6f9c 100644
--- a/win32/bin/bin/7z.exe
+++ b/win32/tools/7z.exe
diff --git a/win32/bin/bin/cp.exe b/win32/tools/cp.exe
index 0ef4fe85..0ef4fe85 100644
--- a/win32/bin/bin/cp.exe
+++ b/win32/tools/cp.exe
diff --git a/win32/bin/bin/find.exe b/win32/tools/find.exe
index 85192fbf..85192fbf 100644
--- a/win32/bin/bin/find.exe
+++ b/win32/tools/find.exe
diff --git a/win32/bin/bin/libeay32.dll b/win32/tools/libeay32.dll
index 8d31f866..8d31f866 100644
--- a/win32/bin/bin/libeay32.dll
+++ b/win32/tools/libeay32.dll
diff --git a/win32/bin/bin/libiconv2.dll b/win32/tools/libiconv2.dll
index 544dd92f..544dd92f 100644
--- a/win32/bin/bin/libiconv2.dll
+++ b/win32/tools/libiconv2.dll
diff --git a/win32/bin/bin/libintl3.dll b/win32/tools/libintl3.dll
index ec11e6b1..ec11e6b1 100644
--- a/win32/bin/bin/libintl3.dll
+++ b/win32/tools/libintl3.dll
diff --git a/win32/bin/bin/libssl32.dll b/win32/tools/libssl32.dll
index a30ff0e9..a30ff0e9 100644
--- a/win32/bin/bin/libssl32.dll
+++ b/win32/tools/libssl32.dll
diff --git a/win32/bin/bin/ls.exe b/win32/tools/ls.exe
index 96ff2e57..96ff2e57 100644
--- a/win32/bin/bin/ls.exe
+++ b/win32/tools/ls.exe
diff --git a/win32/bin/bin/md5sum.exe b/win32/tools/md5sum.exe
index 4ae9f74f..4ae9f74f 100644
--- a/win32/bin/bin/md5sum.exe
+++ b/win32/tools/md5sum.exe
diff --git a/win32/bin/bin/mkdir.exe b/win32/tools/mkdir.exe
index 83e57d97..83e57d97 100644
--- a/win32/bin/bin/mkdir.exe
+++ b/win32/tools/mkdir.exe
diff --git a/win32/bin/bin/mv.exe b/win32/tools/mv.exe
index 9fb65bb9..9fb65bb9 100644
--- a/win32/bin/bin/mv.exe
+++ b/win32/tools/mv.exe
diff --git a/win32/bin/bin/pwd.exe b/win32/tools/pwd.exe
index 7dd114de..7dd114de 100644
--- a/win32/bin/bin/pwd.exe
+++ b/win32/tools/pwd.exe
diff --git a/win32/bin/bin/rmdir.exe b/win32/tools/rmdir.exe
index 6a85c3c4..6a85c3c4 100644
--- a/win32/bin/bin/rmdir.exe
+++ b/win32/tools/rmdir.exe
diff --git a/win32/bin/bin/test.exe b/win32/tools/test.exe
index 94c95f9e..94c95f9e 100644
--- a/win32/bin/bin/test.exe
+++ b/win32/tools/test.exe
diff --git a/win32/bin/bin/uname.exe b/win32/tools/uname.exe
index 3e2f4cf8..3e2f4cf8 100644
--- a/win32/bin/bin/uname.exe
+++ b/win32/tools/uname.exe
diff --git a/win32/bin/bin/wget.exe b/win32/tools/wget.exe
index 54b372e6..54b372e6 100644
--- a/win32/bin/bin/wget.exe
+++ b/win32/tools/wget.exe
diff --git a/win32pack.bat b/win32pack.bat
deleted file mode 100644
index 022a44db..00000000
--- a/win32pack.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@ECHO OFF
-ECHO.
-IF "%1"=="" GOTO GOEXIT
-
-:PACKIT
-mkdir %1
-mkdir %1\test
-mkdir %1\src
-xcopy /S/E .\test\*.* %1\test
-xcopy /S/E .\src\*.* %1\src
-xcopy /S/E .\win32\*.* %1
-copy *.* %1
-del %1\configure
-del %1\makedist
-del %1\Makefile
-del %1\win32pack.bat
-cd %1
-
-GOTO:EOF
-
-:GOEXIT
-ECHO.
-ECHO This command creates a directory with an installable LuaRocks structure. This is
-ECHO a workaround for the packaging script being a unix shell script.
-ECHO.
-ECHO To install LuaRocks on Windows from a Git repo use the following commands: 
-ECHO.
-ECHO    %0 ^<TARGET_DIR^>
-ECHO    install /?
-ECHO.
-ECHO Then follow instructions displayed to install LuaRocks
-ECHO.
-