forked from enlightenment/efl
elua: remove EFL_RUN_IN_TREE hack (pass cmdline args)
This commit is contained in:
parent
329fae97b0
commit
498501b9d7
|
@ -14,7 +14,6 @@ lib_elua_libelua_la_SOURCES = \
|
||||||
|
|
||||||
lib_elua_libelua_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
|
lib_elua_libelua_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
|
||||||
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
|
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
|
||||||
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
|
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
|
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
|
||||||
|
|
||||||
|
@ -33,7 +32,6 @@ bin_elua_elua_SOURCES = \
|
||||||
|
|
||||||
bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
|
bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
|
||||||
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
|
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
|
||||||
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
|
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
|
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,12 @@ ELUA_GEN = @elua_bin@ lualian
|
||||||
_ELUA_GEN_DEP = @elua_bin@
|
_ELUA_GEN_DEP = @elua_bin@
|
||||||
else
|
else
|
||||||
ELUA_GEN = ELUA_EOLIAN_LIBRARY_PATH=$(top_builddir)/src/lib/eolian/.libs \
|
ELUA_GEN = ELUA_EOLIAN_LIBRARY_PATH=$(top_builddir)/src/lib/eolian/.libs \
|
||||||
EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/elua/elua${EXEEXT} lualian
|
$(top_builddir)/src/bin/elua/elua${EXEEXT} \
|
||||||
|
-I$(abs_top_srcdir)/src/bindings/luajit \
|
||||||
|
-C$(abs_top_srcdir)/src/scripts/elua/core \
|
||||||
|
-M$(abs_top_srcdir)/src/scripts/elua/modules \
|
||||||
|
-A$(abs_top_srcdir)/src/scripts/elua/apps \
|
||||||
|
lualian
|
||||||
_ELUA_GEN_DEP = bin/elua/elua${EXEEXT} scripts/elua/apps/lualian.lua \
|
_ELUA_GEN_DEP = bin/elua/elua${EXEEXT} scripts/elua/apps/lualian.lua \
|
||||||
scripts/elua/modules/lualian.lua \
|
scripts/elua/modules/lualian.lua \
|
||||||
scripts/elua/modules/getopt.lua scripts/elua/core/util.lua \
|
scripts/elua/modules/getopt.lua scripts/elua/core/util.lua \
|
||||||
|
|
|
@ -119,14 +119,6 @@ elua_register_require(lua_State *L)
|
||||||
elua_require_ref = luaL_ref(L, LUA_REGISTRYINDEX);
|
elua_require_ref = luaL_ref(L, LUA_REGISTRYINDEX);
|
||||||
lua_pushvalue(L, 2);
|
lua_pushvalue(L, 2);
|
||||||
elua_appload_ref = luaL_ref(L, LUA_REGISTRYINDEX);
|
elua_appload_ref = luaL_ref(L, LUA_REGISTRYINDEX);
|
||||||
if (getenv("EFL_RUN_IN_TREE"))
|
|
||||||
{
|
|
||||||
corepath = PACKAGE_SRC_DIR "/src/scripts/elua/core";
|
|
||||||
modpath = PACKAGE_SRC_DIR "/src/scripts/elua/modules";
|
|
||||||
appspath = PACKAGE_SRC_DIR "/src/scripts/elua/apps";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (!corepath)
|
if (!corepath)
|
||||||
{
|
{
|
||||||
if (noenv || !(corepath = getenv("ELUA_CORE_DIR")) || !corepath[0])
|
if (noenv || !(corepath = getenv("ELUA_CORE_DIR")) || !corepath[0])
|
||||||
|
@ -154,7 +146,6 @@ elua_register_require(lua_State *L)
|
||||||
eina_prefix_data_get(elua_prefix));
|
eina_prefix_data_get(elua_prefix));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
lua_pushfstring(L, "%s/?.lua;", corepath);
|
lua_pushfstring(L, "%s/?.lua;", corepath);
|
||||||
EINA_LIST_FOREACH(largs, l, data)
|
EINA_LIST_FOREACH(largs, l, data)
|
||||||
{
|
{
|
||||||
|
@ -388,15 +379,7 @@ elua_main(lua_State *L)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv("EFL_RUN_IN_TREE"))
|
if (!(coref = coredir))
|
||||||
{
|
|
||||||
Arg_Data *v = malloc(sizeof(Arg_Data));
|
|
||||||
v->type = ARG_LIBDIR;
|
|
||||||
v->value = PACKAGE_SRC_DIR "/src/bindings/luajit";
|
|
||||||
largs = eina_list_append(largs, v);
|
|
||||||
coref = PACKAGE_SRC_DIR "/src/scripts/elua/core";
|
|
||||||
}
|
|
||||||
else if (!(coref = coredir))
|
|
||||||
{
|
{
|
||||||
if (noenv || !(coref = getenv("ELUA_CORE_DIR")) || !coref[0])
|
if (noenv || !(coref = getenv("ELUA_CORE_DIR")) || !coref[0])
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue