[EGIT] [core/efl] master 01/04: efl: fix misspelt focused in API and documents.

[Alastair Poole]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=29c388a35be1b216a4af8f4aa8727060e7edd1d7

commit 29c388a35be1b216a4af8f4aa8727060e7edd1d7
Author: Alastair Poole <***@gmail.com>
Date: Sat Nov 17 14:28:59 2018 +0000

efl: fix misspelt focused in API and documents.

Fix spelling in elm_code API and other documents too where this occurs.
Differential Revision: https://phab.enlightenment.org/D7299
---
src/bin/elementary/test_events.c | 4 ++--
src/lib/elementary/efl_ui_win.c | 2 +-
src/lib/elementary/elm_code_widget.c | 8 ++++----
src/lib/elementary/elm_code_widget_private.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 661a8107f1..1eba66c2dc 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -48,11 +48,11 @@ _key_down(void *data, const Efl_Event *ev)
testdata *td = data;
char str[1024];

- // FIXME: By default the elm_win object is the focussed object
+ // FIXME: By default the elm_win object is the focused object
// this means that evas callbacks will transfer the KEY_UP/KEY_DOWN events
// to the elm_win. So, we get two key_down & two key_up events:
// 1. ecore_evas -> evas -> elm_win forward -> here
- // 2. ecore_evas -> evas -> focussed obj (elm_win) -> here
+ // 2. ecore_evas -> evas -> focused obj (elm_win) -> here

sprintf(str, "key=%s keyname=%s string=%s compose=%s",
efl_input_key_get(ev->info),
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 1e12b46702..0d33fe31f0 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1799,7 +1799,7 @@ _evas_event_key_cb(void *data, const Efl_Event *ev)
if (!evdata || evdata->win_fed)
return;

- // evas_callbacks will send the event to the focussed object (ie. this win)
+ // evas_callbacks will send the event to the focused object (ie. this win)
if (evas_focus_get(evas_object_evas_get(win)) == win)
return;

diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index af10ec0496..68738c10e0 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -161,7 +161,7 @@ _elm_code_widget_status_type_get(Elm_Code_Widget *widget, Elm_Code_Line *line, u
if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT)
return line->status;

- if (pd->editable && pd->focussed && pd->cursor_line == line->number)
+ if (pd->editable && pd->focused && pd->cursor_line == line->number)
return ELM_CODE_STATUS_TYPE_CURRENT;

if (pd->line_width_marker > 0 && pd->line_width_marker == col-1)
@@ -338,7 +338,7 @@ _elm_code_widget_fill_cursor(Elm_Code_Widget *widget, unsigned int number, int g

pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);

- if (pd->visible && pd->editable && pd->focussed && pd->cursor_line == number)
+ if (pd->visible && pd->editable && pd->focused && pd->cursor_line == number)
{
if (pd->cursor_col + gutter - 1 >= (unsigned int) w)
return;
@@ -1850,7 +1850,7 @@ _elm_code_widget_focused_event_cb(void *data, Evas_Object *obj,
widget = (Elm_Code_Widget *)data;
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);

- pd->focussed = EINA_TRUE;
+ pd->focused = EINA_TRUE;
if (pd->cursor_rect)
elm_layout_signal_emit(pd->cursor_rect, "elm,action,focus", "elm");

@@ -1867,7 +1867,7 @@ _elm_code_widget_unfocused_event_cb(void *data, Evas_Object *obj,
widget = (Elm_Code_Widget *)data;
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);

- pd->focussed = EINA_FALSE;
+ pd->focused = EINA_FALSE;
if (pd->cursor_rect)
elm_layout_signal_emit(pd->cursor_rect, "elm,action,unfocus", "elm");

diff --git a/src/lib/elementary/elm_code_widget_private.h b/src/lib/elementary/elm_code_widget_private.h
index ec1e53dc35..3398ad370f 100644
--- a/src/lib/elementary/elm_code_widget_private.h
+++ b/src/lib/elementary/elm_code_widget_private.h
@@ -32,7 +32,7 @@ typedef struct
unsigned int cursor_line, cursor_col;
Evas_Object *cursor_rect;

- Eina_Bool visible, editable, focussed;
+ Eina_Bool visible, editable, focused;
Eina_Bool show_line_numbers;
unsigned int line_width_marker, tabstop;
Eina_Bool show_whitespace, tab_inserts_spaces;

--

[Marcel Hollerbach]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1dabc4970a65c0ea60a0fc8966376704ec247e9a

commit 1dabc4970a65c0ea60a0fc8966376704ec247e9a
Author: Marcel Hollerbach <***@marcel-hollerbach.de>
Date: Sun Dec 2 11:15:47 2018 +0100

ci: disable testing on ubuntu and debian

it appears that there is a bug in meson (which is fixed upstream).
For now this disables the tests, it can be reverted later once 0.49 is
released.

This fixes the cron job for 2 jobs.

Differential Revision: https://phab.enlightenment.org/D7410
---
.ci/ci-make-check.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 1744b4894c..6dff663e69 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -19,12 +19,16 @@ NUM_TRIES=5
travis_fold check "make check-TESTS"
if [ "$BUILDSYSTEM" = "ninja" ] ; then
if [ "$DISTRO" != "" ] ; then
- for tries in $(seq 1 ${NUM_TRIES}); do
- (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && break
- docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
- if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
- false
- done
+ # disable them for this distros, after meson 0.49 is out, this can be removed
+ # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
+ if [ "$DISTRO" != "Ubuntu1804" ] && [ "$DISTRO" != "Debian91" ]; then
+ for tries in $(seq 1 ${NUM_TRIES}); do
+ (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && break
+ docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
+ if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
+ false
+ done
+ fi
fi
else
if [ "$DISTRO" != "" ] ; then

--

[Marcel Hollerbach]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5b98ebab4a990bf943de2db726f9086553187350

commit 5b98ebab4a990bf943de2db726f9086553187350
Author: Marcel Hollerbach <***@marcel-hollerbach.de>
Date: Tue Dec 4 17:43:10 2018 +0100

meson: abstract edje_cc exec lines

the array is calling the shell etc. this makes cross building easier.

Differential Revision: https://phab.enlightenment.org/D7413
---
data/elementary/edje_externals/meson.build | 2 +-
data/elementary/objects/meson.build | 2 +-
data/elementary/themes/meson.build | 2 +-
data/ethumb/frames/meson.build | 2 +-
src/bin/edje/meson.build | 4 ++++
src/examples/edje/meson.build | 4 ++--
src/modules/ethumb/emotion/meson.build | 2 +-
src/tests/edje/data/meson.build | 2 +-
src/tests/edje/tests/meson.build | 4 ++--
src/tests/emotion/data/meson.build | 4 ++--
10 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/data/elementary/edje_externals/meson.build b/data/elementary/edje_externals/meson.build
index cc24430052..445a673198 100644
--- a/data/elementary/edje_externals/meson.build
+++ b/data/elementary/edje_externals/meson.build
@@ -1,7 +1,7 @@
custom_target('edje_cc_edje_externals',
input : 'icons.edc',
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', join_paths(meson.current_source_dir()),
'-id', elm_themes_image_include,
'@INPUT@', '@OUTPUT@'],
diff --git a/data/elementary/objects/meson.build b/data/elementary/objects/meson.build
index a25a719852..5e262e74d2 100644
--- a/data/elementary/objects/meson.build
+++ b/data/elementary/objects/meson.build
@@ -19,7 +19,7 @@ foreach edc_file : edc_files
elm_themes += custom_target('edje_cc_elm_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-sd', join_paths(meson.current_source_dir()),
'-id', elm_themes_image_include,
'-id', join_paths(meson.current_source_dir()),
diff --git a/data/elementary/themes/meson.build b/data/elementary/themes/meson.build
index c8c8816470..b8aa6bb7b3 100644
--- a/data/elementary/themes/meson.build
+++ b/data/elementary/themes/meson.build
@@ -10,7 +10,7 @@ foreach edc_file : edc_files
elm_themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-sd', join_paths(meson.current_source_dir(), 'snd'),
'-id', elm_themes_image_include,
'-id', join_paths(meson.current_source_dir(), 'fdo'),
diff --git a/data/ethumb/frames/meson.build b/data/ethumb/frames/meson.build
index a696af0c41..2031fc4ea9 100644
--- a/data/ethumb/frames/meson.build
+++ b/data/ethumb/frames/meson.build
@@ -3,7 +3,7 @@ ethumb_frame = files('default.edc')
custom_target('edje_cc_ethumb_frame',
input : ethumb_frame,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-sd', join_paths(meson.current_source_dir()),
'-id', join_paths(meson.current_source_dir()),
'-fd', join_paths(meson.current_source_dir()),
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index c7e5f397c2..83e4cbbde3 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -30,6 +30,10 @@ edje_cc = executable('edje_cc',
link_args : bin_linker_args
)

+env = find_program('env')
+
+edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
+
edje_decc_src = [
'edje_decc.c',
'edje_decc.h',
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index 49e7e53c73..69b19b0c52 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -62,7 +62,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
@@ -77,7 +77,7 @@ endforeach
codegen = custom_target('edje_cc_codegen_edc',
input : 'codegen.edc',
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
diff --git a/src/modules/ethumb/emotion/meson.build b/src/modules/ethumb/emotion/meson.build
index 52f4b442a6..2acd578103 100644
--- a/src/modules/ethumb/emotion/meson.build
+++ b/src/modules/ethumb/emotion/meson.build
@@ -8,7 +8,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
diff --git a/src/tests/edje/data/meson.build b/src/tests/edje/data/meson.build
index af7e04bf0e..cf10bd9355 100644
--- a/src/tests/edje/data/meson.build
+++ b/src/tests/edje/data/meson.build
@@ -25,7 +25,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
diff --git a/src/tests/edje/tests/meson.build b/src/tests/edje/tests/meson.build
index 4780bcaeba..6b1e43eb58 100644
--- a/src/tests/edje/tests/meson.build
+++ b/src/tests/edje/tests/meson.build
@@ -6,7 +6,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
@@ -16,4 +16,4 @@ foreach edc_file : edc_files
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
depends : edje_cc)
-endforeach
\ No newline at end of file
+endforeach
diff --git a/src/tests/emotion/data/meson.build b/src/tests/emotion/data/meson.build
index 82c3c03ad8..7402b3a19b 100644
--- a/src/tests/emotion/data/meson.build
+++ b/src/tests/emotion/data/meson.build
@@ -8,7 +8,7 @@ foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
input : edc_file,
output : '@***@.edj',
- command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_cc.full_path(), '-beta',
+ command : edje_cc_exe + [ '-beta',
'-id', meson.current_source_dir(),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
@@ -18,4 +18,4 @@ foreach edc_file : edc_files
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
depends : edje_cc)
-endforeach
\ No newline at end of file
+endforeach

--

[Marcel Hollerbach]

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2197b8eb246ad32d833323d3eeea6328abecce9a

commit 2197b8eb246ad32d833323d3eeea6328abecce9a
Author: Marcel Hollerbach <***@marcel-hollerbach.de>
Date: Tue Dec 4 21:04:07 2018 +0100

meson: remove DATADIR as it is not used

and further more, on windows this causes un-understandable compiler
errors.

Differential Revision: https://phab.enlightenment.org/D7417
---
meson.build | 1 -
1 file changed, 1 deletion(-)

diff --git a/meson.build b/meson.build
index c40d30c185..82205daae5 100644
--- a/meson.build
+++ b/meson.build
@@ -93,7 +93,6 @@ config_h.set_quoted('PACKAGE_SRC_DIR', meson.source_root())
config_h.set_quoted('PACKAGE_BUILD_DIR', meson.current_build_dir())
config_h.set_quoted('PACKAGE_SYSCONF_DIR', dir_sysconf)
config_h.set_quoted('BINDIR', dir_bin)
-config_h.set_quoted('DATADIR', dir_data)
config_h.set10('EFL_HAVE_THREADS', true)
config_h.set10('SLOPPY_SPEC', true)


--