summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2014-12-11 16:59:27 +0000
committerDaniel Kolesa <d.kolesa@samsung.com>2014-12-11 16:59:27 +0000
commitc65221c0ae94833590fd34fca3384f56f2301960 (patch)
treeb988063f231e7692d88ae80a8b4c708f9b97325b
parentaa6f9ea4a9b9185907007be807f3738c8a55f48d (diff)
elua: move core scripts to src/scripts
-rw-r--r--src/Makefile_Elua.am22
-rw-r--r--src/bin/elua/main.c8
-rw-r--r--src/scripts/elua/apps/lualian.lua (renamed from src/bin/elua/apps/lualian.lua)0
-rw-r--r--src/scripts/elua/apps/xgettext.lua (renamed from src/bin/elua/apps/xgettext.lua)0
-rw-r--r--src/scripts/elua/core/gettext.lua (renamed from src/bin/elua/core/gettext.lua)0
-rw-r--r--src/scripts/elua/core/module.lua (renamed from src/bin/elua/core/module.lua)0
-rw-r--r--src/scripts/elua/core/util.lua (renamed from src/bin/elua/core/util.lua)0
-rw-r--r--src/scripts/elua/modules/benchmark.lua (renamed from src/bin/elua/modules/benchmark.lua)0
-rw-r--r--src/scripts/elua/modules/getopt.lua (renamed from src/bin/elua/modules/getopt.lua)0
-rw-r--r--src/scripts/elua/modules/lualian.lua (renamed from src/bin/elua/modules/lualian.lua)0
-rw-r--r--src/scripts/elua/modules/xgettext/generator.lua (renamed from src/bin/elua/modules/xgettext/generator.lua)0
-rw-r--r--src/scripts/elua/modules/xgettext/lexer.lua (renamed from src/bin/elua/modules/xgettext/lexer.lua)0
-rw-r--r--src/scripts/elua/modules/xgettext/parser.lua (renamed from src/bin/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
56eluaappsdir = $(datadir)/elua/apps 56eluaappsdir = $(datadir)/elua/apps
57 57
58eluaapps_DATA = \ 58eluaapps_DATA = \
59 bin/elua/apps/lualian.lua \ 59 scripts/elua/apps/lualian.lua \
60 bin/elua/apps/xgettext.lua 60 scripts/elua/apps/xgettext.lua
61 61
62EXTRA_DIST += $(eluaapps_DATA) 62EXTRA_DIST += $(eluaapps_DATA)
63 63
64eluamodulesdir = $(datadir)/elua/modules 64eluamodulesdir = $(datadir)/elua/modules
65 65
66eluamodules_DATA = \ 66eluamodules_DATA = \
67 bin/elua/modules/benchmark.lua \ 67 scripts/elua/modules/benchmark.lua \
68 bin/elua/modules/getopt.lua \ 68 scripts/elua/modules/getopt.lua \
69 bin/elua/modules/lualian.lua \ 69 scripts/elua/modules/lualian.lua \
70 bindings/luajit/eo.lua \ 70 bindings/luajit/eo.lua \
71 bindings/luajit/eolian.lua 71 bindings/luajit/eolian.lua
72 72
@@ -75,9 +75,9 @@ EXTRA_DIST += $(eluamodules_DATA)
75eluaxgettextdir = $(eluamodulesdir)/xgettext 75eluaxgettextdir = $(eluamodulesdir)/xgettext
76 76
77eluaxgettext_DATA = \ 77eluaxgettext_DATA = \
78 bin/elua/modules/xgettext/lexer.lua \ 78 scripts/elua/modules/xgettext/lexer.lua \
79 bin/elua/modules/xgettext/parser.lua \ 79 scripts/elua/modules/xgettext/parser.lua \
80 bin/elua/modules/xgettext/generator.lua 80 scripts/elua/modules/xgettext/generator.lua
81 81
82EXTRA_DIST += $(eluaxgettext_DATA) 82EXTRA_DIST += $(eluaxgettext_DATA)
83 83
@@ -100,9 +100,9 @@ EXTRA_DIST += $(eluaeina_DATA)
100eluacoredir = $(datadir)/elua/core 100eluacoredir = $(datadir)/elua/core
101 101
102eluacore_DATA = \ 102eluacore_DATA = \
103 bin/elua/core/gettext.lua \ 103 scripts/elua/core/gettext.lua \
104 bin/elua/core/module.lua \ 104 scripts/elua/core/module.lua \
105 bin/elua/core/util.lua 105 scripts/elua/core/util.lua
106 106
107EXTRA_DIST += $(eluacore_DATA) 107EXTRA_DIST += $(eluacore_DATA)
108 108
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)
133 elua_appload_ref = luaL_ref(L, LUA_REGISTRYINDEX); 133 elua_appload_ref = luaL_ref(L, LUA_REGISTRYINDEX);
134 if (getenv("EFL_RUN_IN_TREE")) 134 if (getenv("EFL_RUN_IN_TREE"))
135 { 135 {
136 corepath = PACKAGE_SRC_DIR "/src/bin/elua/core"; 136 corepath = PACKAGE_SRC_DIR "/src/scripts/elua/core";
137 modpath = PACKAGE_SRC_DIR "/src/bin/elua/modules"; 137 modpath = PACKAGE_SRC_DIR "/src/scripts/elua/modules";
138 appspath = PACKAGE_SRC_DIR "/src/bin/elua/apps"; 138 appspath = PACKAGE_SRC_DIR "/src/scripts/elua/apps";
139 } 139 }
140 else 140 else
141 { 141 {
@@ -474,7 +474,7 @@ elua_main(lua_State *L)
474 v->type = ARG_LIBDIR; 474 v->type = ARG_LIBDIR;
475 v->value = PACKAGE_SRC_DIR "/src/bindings/luajit"; 475 v->value = PACKAGE_SRC_DIR "/src/bindings/luajit";
476 largs = eina_list_append(largs, v); 476 largs = eina_list_append(largs, v);
477 coref = PACKAGE_SRC_DIR "/src/bin/elua/core"; 477 coref = PACKAGE_SRC_DIR "/src/scripts/elua/core";
478 } 478 }
479 else if (!(coref = coredir)) 479 else if (!(coref = coredir))
480 { 480 {
diff --git a/src/bin/elua/apps/lualian.lua b/src/scripts/elua/apps/lualian.lua
index 4ffbf58..4ffbf58 100644
--- a/src/bin/elua/apps/lualian.lua
+++ b/src/scripts/elua/apps/lualian.lua
diff --git a/src/bin/elua/apps/xgettext.lua b/src/scripts/elua/apps/xgettext.lua
index 6d3b613..6d3b613 100644
--- a/src/bin/elua/apps/xgettext.lua
+++ b/src/scripts/elua/apps/xgettext.lua
diff --git a/src/bin/elua/core/gettext.lua b/src/scripts/elua/core/gettext.lua
index a77d50a..a77d50a 100644
--- a/src/bin/elua/core/gettext.lua
+++ b/src/scripts/elua/core/gettext.lua
diff --git a/src/bin/elua/core/module.lua b/src/scripts/elua/core/module.lua
index 0415480..0415480 100644
--- a/src/bin/elua/core/module.lua
+++ b/src/scripts/elua/core/module.lua
diff --git a/src/bin/elua/core/util.lua b/src/scripts/elua/core/util.lua
index b273054..b273054 100644
--- a/src/bin/elua/core/util.lua
+++ b/src/scripts/elua/core/util.lua
diff --git a/src/bin/elua/modules/benchmark.lua b/src/scripts/elua/modules/benchmark.lua
index 412ff97..412ff97 100644
--- a/src/bin/elua/modules/benchmark.lua
+++ b/src/scripts/elua/modules/benchmark.lua
diff --git a/src/bin/elua/modules/getopt.lua b/src/scripts/elua/modules/getopt.lua
index 6ac5be8..6ac5be8 100644
--- a/src/bin/elua/modules/getopt.lua
+++ b/src/scripts/elua/modules/getopt.lua
diff --git a/src/bin/elua/modules/lualian.lua b/src/scripts/elua/modules/lualian.lua
index 85208e1..85208e1 100644
--- a/src/bin/elua/modules/lualian.lua
+++ b/src/scripts/elua/modules/lualian.lua
diff --git a/src/bin/elua/modules/xgettext/generator.lua b/src/scripts/elua/modules/xgettext/generator.lua
index 3854f23..3854f23 100644
--- a/src/bin/elua/modules/xgettext/generator.lua
+++ b/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
index 0c8ebd5..0c8ebd5 100644
--- a/src/bin/elua/modules/xgettext/lexer.lua
+++ b/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
index 1d6c252..1d6c252 100644
--- a/src/bin/elua/modules/xgettext/parser.lua
+++ b/src/scripts/elua/modules/xgettext/parser.lua