From 6cab7732e5c3ad98593f17507fde4de0c0db3ab8 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Mon, 9 Sep 2013 15:04:15 +0200 Subject: moved windows binaries into a 'bin' subdirectory. --- install.bat | 8 ++++---- src/luarocks/cfg.lua | 4 ++-- win32/bin/7z.dll | Bin 858624 -> 0 bytes win32/bin/7z.exe | Bin 161792 -> 0 bytes win32/bin/chmod.exe | Bin 81920 -> 0 bytes win32/bin/cp.exe | Bin 130048 -> 0 bytes win32/bin/find.exe | Bin 160256 -> 0 bytes win32/bin/libeay32.dll | Bin 1177600 -> 0 bytes win32/bin/libiconv2.dll | Bin 1008128 -> 0 bytes win32/bin/libintl3.dll | Bin 103424 -> 0 bytes win32/bin/libssl32.dll | Bin 232960 -> 0 bytes win32/bin/ls.exe | Bin 180736 -> 0 bytes win32/bin/md5sum.exe | Bin 41984 -> 0 bytes win32/bin/mkdir.exe | Bin 32768 -> 0 bytes win32/bin/mv.exe | Bin 138752 -> 0 bytes win32/bin/objdump.exe | Bin 2247694 -> 0 bytes win32/bin/pwd.exe | Bin 61440 -> 0 bytes win32/bin/rm.exe | Bin 109056 -> 0 bytes win32/bin/rmdir.exe | Bin 25088 -> 0 bytes win32/bin/test.exe | Bin 62976 -> 0 bytes win32/bin/uname.exe | Bin 33792 -> 0 bytes win32/bin/wget.exe | Bin 449024 -> 0 bytes 22 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 win32/bin/7z.dll delete mode 100644 win32/bin/7z.exe delete mode 100644 win32/bin/chmod.exe delete mode 100755 win32/bin/cp.exe delete mode 100755 win32/bin/find.exe delete mode 100644 win32/bin/libeay32.dll delete mode 100644 win32/bin/libiconv2.dll delete mode 100644 win32/bin/libintl3.dll delete mode 100644 win32/bin/libssl32.dll delete mode 100755 win32/bin/ls.exe delete mode 100644 win32/bin/md5sum.exe delete mode 100755 win32/bin/mkdir.exe delete mode 100755 win32/bin/mv.exe delete mode 100644 win32/bin/objdump.exe delete mode 100755 win32/bin/pwd.exe delete mode 100755 win32/bin/rm.exe delete mode 100755 win32/bin/rmdir.exe delete mode 100755 win32/bin/test.exe delete mode 100755 win32/bin/uname.exe delete mode 100644 win32/bin/wget.exe 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 54b52a66..62c69597 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -31,7 +31,7 @@ end _M.site_config = site_config program_version = "2.1.0" -major_version = program_version:match("([^.]%.[^.])" +major_version = program_version:match("([^.]%.[^.])") local persist = require("luarocks.persist") @@ -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/win32/bin/7z.dll b/win32/bin/7z.dll deleted file mode 100644 index c0ff7fbe..00000000 Binary files a/win32/bin/7z.dll and /dev/null differ diff --git a/win32/bin/7z.exe b/win32/bin/7z.exe deleted file mode 100644 index 5e3d6f9c..00000000 Binary files a/win32/bin/7z.exe and /dev/null differ diff --git a/win32/bin/chmod.exe b/win32/bin/chmod.exe deleted file mode 100644 index 9655cfd6..00000000 Binary files a/win32/bin/chmod.exe and /dev/null differ diff --git a/win32/bin/cp.exe b/win32/bin/cp.exe deleted file mode 100755 index 0ef4fe85..00000000 Binary files a/win32/bin/cp.exe and /dev/null differ diff --git a/win32/bin/find.exe b/win32/bin/find.exe deleted file mode 100755 index 85192fbf..00000000 Binary files a/win32/bin/find.exe and /dev/null differ diff --git a/win32/bin/libeay32.dll b/win32/bin/libeay32.dll deleted file mode 100644 index 8d31f866..00000000 Binary files a/win32/bin/libeay32.dll and /dev/null differ diff --git a/win32/bin/libiconv2.dll b/win32/bin/libiconv2.dll deleted file mode 100644 index 544dd92f..00000000 Binary files a/win32/bin/libiconv2.dll and /dev/null differ diff --git a/win32/bin/libintl3.dll b/win32/bin/libintl3.dll deleted file mode 100644 index ec11e6b1..00000000 Binary files a/win32/bin/libintl3.dll and /dev/null differ diff --git a/win32/bin/libssl32.dll b/win32/bin/libssl32.dll deleted file mode 100644 index a30ff0e9..00000000 Binary files a/win32/bin/libssl32.dll and /dev/null differ diff --git a/win32/bin/ls.exe b/win32/bin/ls.exe deleted file mode 100755 index 96ff2e57..00000000 Binary files a/win32/bin/ls.exe and /dev/null differ diff --git a/win32/bin/md5sum.exe b/win32/bin/md5sum.exe deleted file mode 100644 index 4ae9f74f..00000000 Binary files a/win32/bin/md5sum.exe and /dev/null differ diff --git a/win32/bin/mkdir.exe b/win32/bin/mkdir.exe deleted file mode 100755 index 83e57d97..00000000 Binary files a/win32/bin/mkdir.exe and /dev/null differ diff --git a/win32/bin/mv.exe b/win32/bin/mv.exe deleted file mode 100755 index 9fb65bb9..00000000 Binary files a/win32/bin/mv.exe and /dev/null differ diff --git a/win32/bin/objdump.exe b/win32/bin/objdump.exe deleted file mode 100644 index 4429d103..00000000 Binary files a/win32/bin/objdump.exe and /dev/null differ diff --git a/win32/bin/pwd.exe b/win32/bin/pwd.exe deleted file mode 100755 index 7dd114de..00000000 Binary files a/win32/bin/pwd.exe and /dev/null differ diff --git a/win32/bin/rm.exe b/win32/bin/rm.exe deleted file mode 100755 index 8e79306b..00000000 Binary files a/win32/bin/rm.exe and /dev/null differ diff --git a/win32/bin/rmdir.exe b/win32/bin/rmdir.exe deleted file mode 100755 index 6a85c3c4..00000000 Binary files a/win32/bin/rmdir.exe and /dev/null differ diff --git a/win32/bin/test.exe b/win32/bin/test.exe deleted file mode 100755 index 94c95f9e..00000000 Binary files a/win32/bin/test.exe and /dev/null differ diff --git a/win32/bin/uname.exe b/win32/bin/uname.exe deleted file mode 100755 index 3e2f4cf8..00000000 Binary files a/win32/bin/uname.exe and /dev/null differ diff --git a/win32/bin/wget.exe b/win32/bin/wget.exe deleted file mode 100644 index 54b372e6..00000000 Binary files a/win32/bin/wget.exe and /dev/null differ -- cgit v1.2.3-55-g6feb