aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.setup.inc2
-rw-r--r--install.bat4
-rw-r--r--src/luarocks/fs/win32/pe-parser.lua (renamed from win32/pe-parser.lua)0
3 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.setup.inc b/Makefile.setup.inc
index 127898cf..7aeb46b9 100644
--- a/Makefile.setup.inc
+++ b/Makefile.setup.inc
@@ -6,7 +6,7 @@ LUADIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)
6 6
7BIN_FILES = luarocks luarocks-admin 7BIN_FILES = luarocks luarocks-admin
8LUAROCKS_FILES = fs.lua dir.lua repos.lua command_line.lua upload/api.lua upload/multipart.lua \ 8LUAROCKS_FILES = fs.lua dir.lua repos.lua command_line.lua upload/api.lua upload/multipart.lua \
9admin/index.lua build.lua search.lua fs/win32.lua fs/win32/tools.lua \ 9admin/index.lua build.lua search.lua fs/win32.lua fs/win32/tools.lua fs/win32/pe-parser.lua \
10fs/unix/tools.lua fs/lua.lua fs/tools.lua fs/unix.lua loader.lua cmd/help.lua \ 10fs/unix/tools.lua fs/lua.lua fs/tools.lua fs/unix.lua loader.lua cmd/help.lua \
11cmd/unpack.lua cmd/upload.lua cmd/lint.lua cmd/purge.lua cmd/install.lua \ 11cmd/unpack.lua cmd/upload.lua cmd/lint.lua cmd/purge.lua cmd/install.lua \
12cmd/config.lua cmd/write_rockspec.lua cmd/build.lua cmd/search.lua cmd/test.lua \ 12cmd/config.lua cmd/write_rockspec.lua cmd/build.lua cmd/search.lua cmd/test.lua \
diff --git a/install.bat b/install.bat
index 0ca8639f..5e0f7030 100644
--- a/install.bat
+++ b/install.bat
@@ -51,7 +51,7 @@ local lua_version_set = false
51-- Some helpers 51-- Some helpers
52-- 52--
53 53
54local pe = assert(loadfile(".\\win32\\pe-parser.lua"))() 54local pe = assert(loadfile(".\\src\\luarocks\\fs\\win32\\pe-parser.lua"))()
55 55
56local function die(message) 56local function die(message)
57 if message then print(message) end 57 if message then print(message) end
@@ -1139,8 +1139,6 @@ end
1139-- *********************************************************** 1139-- ***********************************************************
1140-- remove regsitry related files, no longer needed 1140-- remove regsitry related files, no longer needed
1141exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] ) 1141exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] )
1142-- remove pe-parser module
1143exec( S[[del "$PREFIX\pe-parser.lua" >NUL]] )
1144 1142
1145-- *********************************************************** 1143-- ***********************************************************
1146-- Exit handlers 1144-- Exit handlers
diff --git a/win32/pe-parser.lua b/src/luarocks/fs/win32/pe-parser.lua
index 9cd36ffc..9cd36ffc 100644
--- a/win32/pe-parser.lua
+++ b/src/luarocks/fs/win32/pe-parser.lua