The MinGW.org Installation Manager Tool
Revision | 039fbfdedb3720c1a0aed913b7c6fa91fd84262d (tree) |
---|---|
Time | 2013-09-20 05:15:27 |
Author | Keith Marshall <keithmarshall@user...> |
Commiter | Keith Marshall |
Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052)
@@ -1,5 +1,12 @@ | ||
1 | 1 | 2013-09-19 Keith Marshall <keithmarshall@users.sourceforge.net> |
2 | 2 | |
3 | + Correct LUA_PATH assignment for GUI; (cf. MinGW-Bug #2052) | |
4 | + | |
5 | + * src/pkgexec.cpp (LUA_LIBEXEC_PATH): New manifest string; define it. | |
6 | + (init_lua_path) <LUA_PATH>: Use it; add guimain.exe app directory. | |
7 | + | |
8 | +2013-09-19 Keith Marshall <keithmarshall@users.sourceforge.net> | |
9 | + | |
3 | 10 | Handle meta-package removal correctly; (cf. MinGW-Bug #2051) |
4 | 11 | |
5 | 12 | * src/pkgunst.cpp (pkgRemove) [archive == none]: Ensure the pending |
@@ -4,7 +4,7 @@ | ||
4 | 4 | * $Id$ |
5 | 5 | * |
6 | 6 | * Written by Keith Marshall <keithmarshall@users.sourceforge.net> |
7 | - * Copyright (C) 2009, 2010, 2011, 2012, 2013, MinGW.org Project | |
7 | + * Copyright (C) 2009-2013, MinGW.org Project | |
8 | 8 | * |
9 | 9 | * |
10 | 10 | * Implementation of package management task scheduler and executive. |
@@ -752,12 +752,13 @@ static const char *action_key = "action"; | ||
752 | 752 | static const char *normal_key = "normal"; |
753 | 753 | |
754 | 754 | static inline __attribute__((__always_inline__)) bool init_lua_path() |
755 | +# define LUA_LIBEXEC_PATH "\\libexec\\mingw-get\\?.lua" | |
755 | 756 | { |
756 | 757 | /* A one time initialisation hook, to ensure that the built-in Lua script |
757 | 758 | * interpreter will load scripts from the libexec directory associated with |
758 | 759 | * the running mingw-get.exe instance. |
759 | 760 | */ |
760 | - putenv( "LUA_PATH=!\\libexec\\mingw-get\\?.lua;!\\..\\libexec\\mingw-get\\?.lua" ); | |
761 | + putenv( "LUA_PATH=!\\?.lua;!"LUA_LIBEXEC_PATH";!\\.."LUA_LIBEXEC_PATH ); | |
761 | 762 | return true; |
762 | 763 | } |
763 | 764 |