diff options
-rw-r--r-- | Makefile.setup.inc | 2 | ||||
-rw-r--r-- | install.bat | 4 | ||||
-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 | ||
7 | BIN_FILES = luarocks luarocks-admin | 7 | BIN_FILES = luarocks luarocks-admin |
8 | LUAROCKS_FILES = fs.lua dir.lua repos.lua command_line.lua upload/api.lua upload/multipart.lua \ | 8 | LUAROCKS_FILES = fs.lua dir.lua repos.lua command_line.lua upload/api.lua upload/multipart.lua \ |
9 | admin/index.lua build.lua search.lua fs/win32.lua fs/win32/tools.lua \ | 9 | admin/index.lua build.lua search.lua fs/win32.lua fs/win32/tools.lua fs/win32/pe-parser.lua \ |
10 | fs/unix/tools.lua fs/lua.lua fs/tools.lua fs/unix.lua loader.lua cmd/help.lua \ | 10 | fs/unix/tools.lua fs/lua.lua fs/tools.lua fs/unix.lua loader.lua cmd/help.lua \ |
11 | cmd/unpack.lua cmd/upload.lua cmd/lint.lua cmd/purge.lua cmd/install.lua \ | 11 | cmd/unpack.lua cmd/upload.lua cmd/lint.lua cmd/purge.lua cmd/install.lua \ |
12 | cmd/config.lua cmd/write_rockspec.lua cmd/build.lua cmd/search.lua cmd/test.lua \ | 12 | cmd/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 | ||
54 | local pe = assert(loadfile(".\\win32\\pe-parser.lua"))() | 54 | local pe = assert(loadfile(".\\src\\luarocks\\fs\\win32\\pe-parser.lua"))() |
55 | 55 | ||
56 | local function die(message) | 56 | local 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 |
1141 | exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] ) | 1141 | exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] ) |
1142 | -- remove pe-parser module | ||
1143 | exec( 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 | |||