AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Patch 3441850: Use debug.traceback() as error handler (Konstantin Tokarev)

Browse Source
This commit is contained in:
Jason Perkins 2012-10-17 18:59:55 -04:00
parent 37ae88092f
commit 815f89b8bf
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -84,6 +84,8 @@
* Patch 3476176: Remove conditionals from makefile compiler assignments (Konstantin Tokarev) * Patch 3476176: Remove conditionals from makefile compiler assignments (Konstantin Tokarev)
* Pull 1: Fixed path to Info.plist in Xcode projects (Adrien Anselme) * Pull 1: Fixed path to Info.plist in Xcode projects (Adrien Anselme)
* Patch 3367642: Add support for targetextension property to Xcode * Patch 3367642: Add support for targetextension property to Xcode
* Patch 3435716: Fix for PS3 config generation in VS2010 (Jake)
* Patch 3441850: Use debug.traceback() as error handler (Konstantin Tokarev)
------- -------

6
src/host/premake.c
View File

@ -318,10 +318,14 @@ int load_builtin_scripts(lua_State* L)
return !OKAY; return !OKAY;
} }
/* in debug mode, show full traceback on all errors */
lua_getglobal(L, "debug");
lua_getfield(L, -1, "traceback");
/* hand off control to the scripts */ /* hand off control to the scripts */
lua_getglobal(L, "_premake_main"); lua_getglobal(L, "_premake_main");
lua_pushstring(L, scripts_path); lua_pushstring(L, scripts_path);
if (lua_pcall(L, 1, 1, 0) != OKAY) if (lua_pcall(L, 1, 1, -3) != OKAY)
{ {
printf(ERROR_MESSAGE, lua_tostring(L, -1)); printf(ERROR_MESSAGE, lua_tostring(L, -1));
return !OKAY; return !OKAY;