diff options
author | Daniel Kolesa <d.kolesa@samsung.com> | 2020-05-29 17:06:22 +0200 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@samsung.com> | 2020-05-29 17:06:22 +0200 |
commit | f78d54051c26a8d3c9b3bfc61e44df09bf24e401 (patch) | |
tree | eb757679257c00fd01fcbf9992e13b97f3dd19b9 | |
parent | b0203b3160f2a39c3afe549fd34a513f71532fc3 (diff) | |
download | efl-f78d54051c26a8d3c9b3bfc61e44df09bf24e401.tar.gz |
bindings: rename luajit -> lua
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | meson_options.txt | 4 | ||||
-rw-r--r-- | src/bindings/lua/.gitignore (renamed from src/bindings/luajit/.gitignore) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/accessor.lua (renamed from src/bindings/luajit/eina/accessor.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/counter.lua (renamed from src/bindings/luajit/eina/counter.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/file.lua (renamed from src/bindings/luajit/eina/file.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/hamster.lua (renamed from src/bindings/luajit/eina/hamster.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/iterator.lua (renamed from src/bindings/luajit/eina/iterator.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/list.lua (renamed from src/bindings/luajit/eina/list.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/log.lua (renamed from src/bindings/luajit/eina/log.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/rectangle.lua (renamed from src/bindings/luajit/eina/rectangle.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/tiler.lua (renamed from src/bindings/luajit/eina/tiler.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eina/xattr.lua (renamed from src/bindings/luajit/eina/xattr.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eo.lua (renamed from src/bindings/luajit/eo.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/eolian.lua (renamed from src/bindings/luajit/eolian.lua) | 0 | ||||
-rw-r--r-- | src/bindings/lua/meson.build (renamed from src/bindings/luajit/meson.build) | 0 | ||||
-rw-r--r-- | src/bindings/meson.build | 2 | ||||
-rw-r--r-- | src/lib/elua/cache.c | 2 | ||||
-rw-r--r-- | src/tests/elua/meson.build | 2 |
19 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 2ede020824..5369b46169 100644 --- a/meson.build +++ b/meson.build @@ -338,7 +338,7 @@ subprojects = [ ['ethumb_client' ,[] , false, true, true, false, false, true, true, ['eina', 'efl', 'eo', 'ethumb'], []], ['elementary' ,[] , true, true, true, true, true, true, true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']], ['efl_canvas_wl' ,['wl'] , false, true, true, false, false, false, true, ['eina', 'efl', 'eo', 'evas', 'ecore'], []], -['elua' ,['elua'] , false, true, true, false, true, false, false, ['eina', 'luajit'], []], +['elua' ,['elua'] , false, true, true, false, true, false, false, ['eina', lua_pc_name], []], ['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, false, ['eina'], []], ['ecore_drm' ,['drm-deprecated'] , false, true, false, false, false, false, false, ['eina'], []], ['exactness' ,[] , false, false, true, false, false, false, false, ['eina, evas, eet'], []], diff --git a/meson_options.txt b/meson_options.txt index 159f2c2649..6b2464a03a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -286,8 +286,8 @@ option('nls', option('bindings', type : 'array', - choices : ['luajit', 'cxx', 'mono'], - value : ['luajit', 'cxx'], + choices : ['lua', 'cxx', 'mono'], + value : ['lua', 'cxx'], description : 'Which auto-generated language bindings for efl to enable', ) diff --git a/src/bindings/luajit/.gitignore b/src/bindings/lua/.gitignore index 31b688b99b..31b688b99b 100644 --- a/src/bindings/luajit/.gitignore +++ b/src/bindings/lua/.gitignore diff --git a/src/bindings/luajit/eina/accessor.lua b/src/bindings/lua/eina/accessor.lua index d2068fc8b5..d2068fc8b5 100644 --- a/src/bindings/luajit/eina/accessor.lua +++ b/src/bindings/lua/eina/accessor.lua diff --git a/src/bindings/luajit/eina/counter.lua b/src/bindings/lua/eina/counter.lua index 6a9ba33284..6a9ba33284 100644 --- a/src/bindings/luajit/eina/counter.lua +++ b/src/bindings/lua/eina/counter.lua diff --git a/src/bindings/luajit/eina/file.lua b/src/bindings/lua/eina/file.lua index 3f59391b60..3f59391b60 100644 --- a/src/bindings/luajit/eina/file.lua +++ b/src/bindings/lua/eina/file.lua diff --git a/src/bindings/luajit/eina/hamster.lua b/src/bindings/lua/eina/hamster.lua index e8f5e7434f..e8f5e7434f 100644 --- a/src/bindings/luajit/eina/hamster.lua +++ b/src/bindings/lua/eina/hamster.lua diff --git a/src/bindings/luajit/eina/iterator.lua b/src/bindings/lua/eina/iterator.lua index 196a968500..196a968500 100644 --- a/src/bindings/luajit/eina/iterator.lua +++ b/src/bindings/lua/eina/iterator.lua diff --git a/src/bindings/luajit/eina/list.lua b/src/bindings/lua/eina/list.lua index 4c0bc6bd17..4c0bc6bd17 100644 --- a/src/bindings/luajit/eina/list.lua +++ b/src/bindings/lua/eina/list.lua diff --git a/src/bindings/luajit/eina/log.lua b/src/bindings/lua/eina/log.lua index d2b1180b96..d2b1180b96 100644 --- a/src/bindings/luajit/eina/log.lua +++ b/src/bindings/lua/eina/log.lua diff --git a/src/bindings/luajit/eina/rectangle.lua b/src/bindings/lua/eina/rectangle.lua index d9988b7f2b..d9988b7f2b 100644 --- a/src/bindings/luajit/eina/rectangle.lua +++ b/src/bindings/lua/eina/rectangle.lua diff --git a/src/bindings/luajit/eina/tiler.lua b/src/bindings/lua/eina/tiler.lua index 15f4a10771..15f4a10771 100644 --- a/src/bindings/luajit/eina/tiler.lua +++ b/src/bindings/lua/eina/tiler.lua diff --git a/src/bindings/luajit/eina/xattr.lua b/src/bindings/lua/eina/xattr.lua index 3e2417d194..3e2417d194 100644 --- a/src/bindings/luajit/eina/xattr.lua +++ b/src/bindings/lua/eina/xattr.lua diff --git a/src/bindings/luajit/eo.lua b/src/bindings/lua/eo.lua index 42531aa153..42531aa153 100644 --- a/src/bindings/luajit/eo.lua +++ b/src/bindings/lua/eo.lua diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/lua/eolian.lua index e9001dbc66..e9001dbc66 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/lua/eolian.lua diff --git a/src/bindings/luajit/meson.build b/src/bindings/lua/meson.build index a1dd6463ea..a1dd6463ea 100644 --- a/src/bindings/luajit/meson.build +++ b/src/bindings/lua/meson.build diff --git a/src/bindings/meson.build b/src/bindings/meson.build index b59e084d8a..61027d3743 100644 --- a/src/bindings/meson.build +++ b/src/bindings/meson.build @@ -1,6 +1,6 @@ bindings = get_option('bindings') -bindings_order = ['luajit', 'cxx', 'mono'] +bindings_order = ['lua', 'cxx', 'mono'] if (get_option('dotnet') and not bindings.contains('mono')) message('dotnet support requires the C# bindings') diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c index ff11268ab2..bb20c9ac3b 100644 --- a/src/lib/elua/cache.c +++ b/src/lib/elua/cache.c @@ -136,7 +136,7 @@ getf_map(lua_State *L EINA_UNUSED, void *ud, size_t *size) Map_Stream *s = ud; const char *fmap = s->fmap; *size = s->flen; - /* gotta null it - tell luajit to terminate reading */ + /* gotta null it - tell lua to terminate reading */ s->fmap = NULL; return fmap; } diff --git a/src/tests/elua/meson.build b/src/tests/elua/meson.build index 22174f0bb0..fc6829ce71 100644 --- a/src/tests/elua/meson.build +++ b/src/tests/elua/meson.build @@ -6,7 +6,7 @@ elua_suite_src = [ 'elua_lib.c' ] -elua_bindings_dir = join_paths(meson.source_root(), 'src', 'bindings', 'luajit') +elua_bindings_dir = join_paths(meson.source_root(), 'src', 'bindings', 'lua') elua_core_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'core') elua_modules_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'modules') elua_apps_dir = join_paths(meson.source_root(), 'src', 'tests', 'elua', 'data', 'apps') |