q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c65221c0ae94833590fd34fca3384f56f2301960
commit c65221c0ae94833590fd34fca3384f56f2301960 Author: Daniel Kolesa <[email protected]> Date: Thu Dec 11 16:59:27 2014 +0000 elua: move core scripts to src/scripts --- src/Makefile_Elua.am | 22 +++++++++++----------- src/bin/elua/main.c | 8 ++++---- src/{bin => scripts}/elua/apps/lualian.lua | 0 src/{bin => scripts}/elua/apps/xgettext.lua | 0 src/{bin => scripts}/elua/core/gettext.lua | 0 src/{bin => scripts}/elua/core/module.lua | 0 src/{bin => scripts}/elua/core/util.lua | 0 src/{bin => scripts}/elua/modules/benchmark.lua | 0 src/{bin => scripts}/elua/modules/getopt.lua | 0 src/{bin => scripts}/elua/modules/lualian.lua | 0 .../elua/modules/xgettext/generator.lua | 0 .../elua/modules/xgettext/lexer.lua | 0 .../elua/modules/xgettext/parser.lua | 0 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am index 63942f5..cd30251 100644 --- a/src/Makefile_Elua.am +++ b/src/Makefile_Elua.am @@ -56,17 +56,17 @@ include Makefile_Elua_Helper.am eluaappsdir = $(datadir)/elua/apps eluaapps_DATA = \ - bin/elua/apps/lualian.lua \ - bin/elua/apps/xgettext.lua + scripts/elua/apps/lualian.lua \ + scripts/elua/apps/xgettext.lua EXTRA_DIST += $(eluaapps_DATA) eluamodulesdir = $(datadir)/elua/modules eluamodules_DATA = \ - bin/elua/modules/benchmark.lua \ - bin/elua/modules/getopt.lua \ - bin/elua/modules/lualian.lua \ + scripts/elua/modules/benchmark.lua \ + scripts/elua/modules/getopt.lua \ + scripts/elua/modules/lualian.lua \ bindings/luajit/eo.lua \ bindings/luajit/eolian.lua @@ -75,9 +75,9 @@ EXTRA_DIST += $(eluamodules_DATA) eluaxgettextdir = $(eluamodulesdir)/xgettext eluaxgettext_DATA = \ - bin/elua/modules/xgettext/lexer.lua \ - bin/elua/modules/xgettext/parser.lua \ - bin/elua/modules/xgettext/generator.lua + scripts/elua/modules/xgettext/lexer.lua \ + scripts/elua/modules/xgettext/parser.lua \ + scripts/elua/modules/xgettext/generator.lua EXTRA_DIST += $(eluaxgettext_DATA) @@ -100,9 +100,9 @@ EXTRA_DIST += $(eluaeina_DATA) eluacoredir = $(datadir)/elua/core eluacore_DATA = \ - bin/elua/core/gettext.lua \ - bin/elua/core/module.lua \ - bin/elua/core/util.lua + scripts/elua/core/gettext.lua \ + scripts/elua/core/module.lua \ + scripts/elua/core/util.lua EXTRA_DIST += $(eluacore_DATA) diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c index 8d789db..4b8b40f 100644 --- a/src/bin/elua/main.c +++ b/src/bin/elua/main.c @@ -133,9 +133,9 @@ elua_register_require(lua_State *L) elua_appload_ref = luaL_ref(L, LUA_REGISTRYINDEX); if (getenv("EFL_RUN_IN_TREE")) { - corepath = PACKAGE_SRC_DIR "/src/bin/elua/core"; - modpath = PACKAGE_SRC_DIR "/src/bin/elua/modules"; - appspath = PACKAGE_SRC_DIR "/src/bin/elua/apps"; + 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 { @@ -474,7 +474,7 @@ elua_main(lua_State *L) v->type = ARG_LIBDIR; v->value = PACKAGE_SRC_DIR "/src/bindings/luajit"; largs = eina_list_append(largs, v); - coref = PACKAGE_SRC_DIR "/src/bin/elua/core"; + coref = PACKAGE_SRC_DIR "/src/scripts/elua/core"; } else if (!(coref = coredir)) { diff --git a/src/bin/elua/apps/lualian.lua b/src/scripts/elua/apps/lualian.lua similarity index 100% rename from src/bin/elua/apps/lualian.lua rename to src/scripts/elua/apps/lualian.lua diff --git a/src/bin/elua/apps/xgettext.lua b/src/scripts/elua/apps/xgettext.lua similarity index 100% rename from src/bin/elua/apps/xgettext.lua rename to src/scripts/elua/apps/xgettext.lua diff --git a/src/bin/elua/core/gettext.lua b/src/scripts/elua/core/gettext.lua similarity index 100% rename from src/bin/elua/core/gettext.lua rename to src/scripts/elua/core/gettext.lua diff --git a/src/bin/elua/core/module.lua b/src/scripts/elua/core/module.lua similarity index 100% rename from src/bin/elua/core/module.lua rename to src/scripts/elua/core/module.lua diff --git a/src/bin/elua/core/util.lua b/src/scripts/elua/core/util.lua similarity index 100% rename from src/bin/elua/core/util.lua rename to src/scripts/elua/core/util.lua diff --git a/src/bin/elua/modules/benchmark.lua b/src/scripts/elua/modules/benchmark.lua similarity index 100% rename from src/bin/elua/modules/benchmark.lua rename to src/scripts/elua/modules/benchmark.lua diff --git a/src/bin/elua/modules/getopt.lua b/src/scripts/elua/modules/getopt.lua similarity index 100% rename from src/bin/elua/modules/getopt.lua rename to src/scripts/elua/modules/getopt.lua diff --git a/src/bin/elua/modules/lualian.lua b/src/scripts/elua/modules/lualian.lua similarity index 100% rename from src/bin/elua/modules/lualian.lua rename to src/scripts/elua/modules/lualian.lua diff --git a/src/bin/elua/modules/xgettext/generator.lua b/src/scripts/elua/modules/xgettext/generator.lua similarity index 100% rename from src/bin/elua/modules/xgettext/generator.lua rename to src/scripts/elua/modules/xgettext/generator.lua diff --git a/src/bin/elua/modules/xgettext/lexer.lua b/src/scripts/elua/modules/xgettext/lexer.lua similarity index 100% rename from src/bin/elua/modules/xgettext/lexer.lua rename to src/scripts/elua/modules/xgettext/lexer.lua diff --git a/src/bin/elua/modules/xgettext/parser.lua b/src/scripts/elua/modules/xgettext/parser.lua similarity index 100% rename from src/bin/elua/modules/xgettext/parser.lua rename to src/scripts/elua/modules/xgettext/parser.lua --
