AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Move manifest loading to host executable

Browse Source
This commit is contained in:
Jason Perkins 2013-09-10 16:47:41 -04:00
parent 985c58103c
commit d77a856629
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/_premake_main.lua
View File

@ -14,18 +14,7 @@
-- Script-side program entry point.
--
function _premake_main(scriptpath)
-- if running off the disk (in debug mode), load everything
-- listed in _manifest.lua; the list divisions make sure
-- everything gets initialized in the proper order.
if (scriptpath) then
local scripts = dofile(scriptpath .. "/_manifest.lua")
for _,v in ipairs(scripts) do
dofile(scriptpath .. "/" .. v)
end
end
function _premake_main()
-- Seed the random number generator so actions don't have to do it themselves

25
src/host/premake.c
View File

@ -322,8 +322,28 @@ int load_builtin_scripts(lua_State* L)
return !OKAY;
}
/* run the bootstrapping script */
/* load the manifest, which includes all the required scripts */
scripts_path = lua_tostring(L, -1);
filename = lua_pushfstring(L, "%s/_manifest.lua", scripts_path);
if (luaL_dofile(L, filename))
{
printf(ERROR_MESSAGE, lua_tostring(L, -1));
return !OKAY;
}
lua_pushnil(L);
while (lua_next(L, -2))
{
filename = lua_pushfstring(L, "%s/%s", scripts_path, lua_tostring(L, -1));
if (luaL_dofile(L, filename)) {
printf(ERROR_MESSAGE, lua_tostring(L, -1));
return !OKAY;
}
lua_pop(L, 2);
}
lua_pop(L, 1);
/* run the bootstrapping script */
filename = lua_pushfstring(L, "%s/_premake_main.lua", scripts_path);
if (luaL_dofile(L, filename))
{
@ -337,8 +357,7 @@ int load_builtin_scripts(lua_State* L)
/* hand off control to the scripts */
lua_getglobal(L, "_premake_main");
lua_pushstring(L, scripts_path);
if (lua_pcall(L, 1, 1, -3) != OKAY)
if (lua_pcall(L, 0, 1, -3) != OKAY)
{
printf(ERROR_MESSAGE, lua_tostring(L, -1));
return !OKAY;