mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add the Automation include path to lua's module load path.

Browse source 
Originally committed to SVN as r4038.
This commit is contained in:
Thomas Goyne 2010-01-24 19:07:34 +00:00
parent 7ffc3d4080
commit 0a12e60a36
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
aegisub/src/auto4_lua.cpp
View file

@ -47,6 +47,7 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/log.h> #include <wx/log.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/tokenzr.h>
#include <wx/window.h> #include <wx/window.h>
#endif #endif
@ -58,6 +59,7 @@
#include "auto4_lua_factory.h" #include "auto4_lua_factory.h"
#include "auto4_lua_scriptreader.h" #include "auto4_lua_scriptreader.h"
#include "options.h" #include "options.h"
#include "standard_paths.h"
#include "text_file_reader.h" #include "text_file_reader.h"
#include "vfr.h" #include "vfr.h"
#include "video_context.h" #include "video_context.h"
@ -188,6 +190,26 @@ namespace Automation4 {
lua_pushcfunction(L, LuaInclude); lua_pushcfunction(L, LuaInclude);
lua_setglobal(L, "include"); lua_setglobal(L, "include");
// add include_path to the module load path
lua_getglobal(L, "package");
lua_pushstring(L, "path");
lua_pushstring(L, "path");
lua_gettable(L, -3);
wxStringTokenizer toker(Options.AsText(_T("Automation Include Path")), _T("|"), wxTOKEN_STRTOK);
while (toker.HasMoreTokens()) {
wxFileName path(StandardPaths::DecodePath(toker.GetNextToken()));
if (path.IsOk() && !path.IsRelative() && path.DirExists()) {
wxCharBuffer p = path.GetLongPath().utf8_str();
lua_pushfstring(L, ";%s/?.lua;%s/?/init.lua", p.data(), p.data());
lua_concat(L, 2);
}
}
lua_settable(L, -3);
lua_pop(L, 1); // pop package
_stackcheck.check_stack(0);
// prepare stuff in the registry // prepare stuff in the registry
// reference to the script object // reference to the script object
lua_pushlightuserdata(L, this); lua_pushlightuserdata(L, this);
@ -386,7 +408,6 @@ namespace Automation4 {
return 4; return 4;
} }
/// @brief DOCME /// @brief DOCME
/// @param L /// @param L
/// @return /// @return
@ -1152,5 +1173,3 @@ namespace Automation4 {
}; };
#endif // WITH_AUTO4_LUA #endif // WITH_AUTO4_LUA