ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=0782aa5671676d0ff21d66626171fe1fdff82ca2
commit 0782aa5671676d0ff21d66626171fe1fdff82ca2 Author: Andy Williams <[email protected]> Date: Wed Nov 15 18:22:44 2017 +0000 build: Update deps to efl-core --- tutorial/c/eo-classes/meson.build | 3 +-- tutorial/c/eo-classes/src/eo_classes_main.c | 3 +-- tutorial/c/eo-classes/src/meson.build | 2 +- tutorial/c/eo-inherit/meson.build | 3 +-- tutorial/c/eo-inherit/src/eo_inherit.h | 3 +-- tutorial/c/eo-inherit/src/meson.build | 2 +- tutorial/c/eo-intro/meson.build | 3 +-- tutorial/c/eo-intro/src/eo_intro_main.c | 3 +-- tutorial/c/eo-intro/src/meson.build | 2 +- tutorial/c/eo-refcount/meson.build | 3 +-- tutorial/c/eo-refcount/src/eo_refcount_main.c | 3 +-- tutorial/c/eo-refcount/src/meson.build | 2 +- tutorial/c/lib/meson.build | 3 +-- tutorial/c/lib/src/lib/meson.build | 2 +- tutorial/c/lib/src/test/meson.build | 2 +- tutorial/c/lib/src/test/runner.c | 2 +- tutorial/c/lifecycle/meson.build | 3 +-- tutorial/c/lifecycle/src/lifecycle_main.c | 9 ++++----- tutorial/c/lifecycle/src/meson.build | 2 +- 19 files changed, 22 insertions(+), 33 deletions(-) diff --git a/tutorial/c/eo-classes/meson.build b/tutorial/c/eo-classes/meson.build index a84c7ba..aee782b 100644 --- a/tutorial/c/eo-classes/meson.build +++ b/tutorial/c/eo-classes/meson.build @@ -5,8 +5,7 @@ project( meson_version : '>= 0.38.0') eina = dependency('eina', version : '>=1.20.99') -efl = dependency('efl', version : '>=1.20.99') -elm = dependency('elementary', version : '>=1.20.99') +efl = dependency('efl-core', version : '>=1.20.99') eolian = dependency('eolian', version : '>=1.20.99') inc = include_directories('.') diff --git a/tutorial/c/eo-classes/src/eo_classes_main.c b/tutorial/c/eo-classes/src/eo_classes_main.c index 39932f4..6f885a6 100644 --- a/tutorial/c/eo-classes/src/eo_classes_main.c +++ b/tutorial/c/eo-classes/src/eo_classes_main.c @@ -2,8 +2,7 @@ #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> -#include <Efl.h> -#include <Elementary.h> +#include <Efl_Core.h> #include "example_rectangle.eo.h" Example_Rectangle * diff --git a/tutorial/c/eo-classes/src/meson.build b/tutorial/c/eo-classes/src/meson.build index afb4cd2..831f11c 100644 --- a/tutorial/c/eo-classes/src/meson.build +++ b/tutorial/c/eo-classes/src/meson.build @@ -23,7 +23,7 @@ src = files([ 'eo_classes_main.c', ]) -deps = [eina, efl, elm] +deps = [eina, efl] executable('efl_example_eo_classes', src, eo_csrc, eo_gen, dependencies : deps, diff --git a/tutorial/c/eo-inherit/meson.build b/tutorial/c/eo-inherit/meson.build index ce5c07d..55cdb94 100644 --- a/tutorial/c/eo-inherit/meson.build +++ b/tutorial/c/eo-inherit/meson.build @@ -5,8 +5,7 @@ project( meson_version : '>= 0.38.0') eina = dependency('eina', version : '>=1.20.99') -efl = dependency('efl', version : '>=1.20.99') -elm = dependency('elementary', version : '>=1.20.99') +efl = dependency('efl-core', version : '>=1.20.99') eolian = dependency('eolian', version : '>=1.20.99') inc = include_directories('.') diff --git a/tutorial/c/eo-inherit/src/eo_inherit.h b/tutorial/c/eo-inherit/src/eo_inherit.h index cbfe863..4c9fe63 100644 --- a/tutorial/c/eo-inherit/src/eo_inherit.h +++ b/tutorial/c/eo-inherit/src/eo_inherit.h @@ -7,8 +7,7 @@ #endif #include <Eina.h> -#include <Efl.h> -#include <Elementary.h> +#include <Efl_Core.h> #include "example_shape.eo.h" #include "example_rectangle.eo.h" diff --git a/tutorial/c/eo-inherit/src/meson.build b/tutorial/c/eo-inherit/src/meson.build index 09208a5..ec92317 100644 --- a/tutorial/c/eo-inherit/src/meson.build +++ b/tutorial/c/eo-inherit/src/meson.build @@ -24,7 +24,7 @@ src = files([ 'eo_inherit_main.c', ]) -deps = [eina, efl, elm] +deps = [eina, efl] executable('efl_example_eo_inherit', src, eo_csrc, eo_gen, dependencies : deps, diff --git a/tutorial/c/eo-intro/meson.build b/tutorial/c/eo-intro/meson.build index 6310cd7..5f10b53 100644 --- a/tutorial/c/eo-intro/meson.build +++ b/tutorial/c/eo-intro/meson.build @@ -5,8 +5,7 @@ project( meson_version : '>= 0.38.0') eina = dependency('eina', version : '>=1.20.99') -efl = dependency('efl', version : '>=1.20.99') -elm = dependency('elementary', version : '>=1.20.99') +efl = dependency('efl-core', version : '>=1.20.99') inc = include_directories('.') subdir('src') diff --git a/tutorial/c/eo-intro/src/eo_intro_main.c b/tutorial/c/eo-intro/src/eo_intro_main.c index 90dcd1b..4c564bd 100644 --- a/tutorial/c/eo-intro/src/eo_intro_main.c +++ b/tutorial/c/eo-intro/src/eo_intro_main.c @@ -2,8 +2,7 @@ #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> -#include <Efl.h> -#include <Elementary.h> +#include <Efl_Core.h> #include <stdlib.h> diff --git a/tutorial/c/eo-intro/src/meson.build b/tutorial/c/eo-intro/src/meson.build index f46d0bc..dca9b1b 100644 --- a/tutorial/c/eo-intro/src/meson.build +++ b/tutorial/c/eo-intro/src/meson.build @@ -2,7 +2,7 @@ src = files([ 'eo_intro_main.c', ]) -deps = [eina, efl, elm] +deps = [eina, efl] executable('efl_example_eo_intro', src, dependencies : deps, diff --git a/tutorial/c/eo-refcount/meson.build b/tutorial/c/eo-refcount/meson.build index dff8ea9..e25caa5 100644 --- a/tutorial/c/eo-refcount/meson.build +++ b/tutorial/c/eo-refcount/meson.build @@ -5,8 +5,7 @@ project( meson_version : '>= 0.38.0') eina = dependency('eina', version : '>=1.20.99') -efl = dependency('efl', version : '>=1.20.99') -elm = dependency('elementary', version : '>=1.20.99') +efl = dependency('efl-core', version : '>=1.20.99') inc = include_directories('.') subdir('src') diff --git a/tutorial/c/eo-refcount/src/eo_refcount_main.c b/tutorial/c/eo-refcount/src/eo_refcount_main.c index e6cd2fb..d71d30c 100644 --- a/tutorial/c/eo-refcount/src/eo_refcount_main.c +++ b/tutorial/c/eo-refcount/src/eo_refcount_main.c @@ -2,8 +2,7 @@ #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> -#include <Efl.h> -#include <Elementary.h> +#include <Efl_Core.h> #include <stdlib.h> diff --git a/tutorial/c/eo-refcount/src/meson.build b/tutorial/c/eo-refcount/src/meson.build index efea9ab..6620d21 100644 --- a/tutorial/c/eo-refcount/src/meson.build +++ b/tutorial/c/eo-refcount/src/meson.build @@ -2,7 +2,7 @@ src = files([ 'eo_refcount_main.c', ]) -deps = [eina, efl, elm] +deps = [eina, efl] executable('efl_example_eo_refcount', src, dependencies : deps, diff --git a/tutorial/c/lib/meson.build b/tutorial/c/lib/meson.build index 0830065..d2c7b8e 100644 --- a/tutorial/c/lib/meson.build +++ b/tutorial/c/lib/meson.build @@ -5,8 +5,7 @@ project( meson_version : '>= 0.38.0') eina = dependency('eina', version : '>=1.20.99') -efl = dependency('efl', version : '>=1.20.99') -elm = dependency('elementary', version : '>=1.20.99') +efl = dependency('efl-core', version : '>=1.20.99') inc = include_directories('.') subdir('src') diff --git a/tutorial/c/lib/src/lib/meson.build b/tutorial/c/lib/src/lib/meson.build index 88f066a..8f05e32 100644 --- a/tutorial/c/lib/src/lib/meson.build +++ b/tutorial/c/lib/src/lib/meson.build @@ -4,7 +4,7 @@ src = files([ ]) lib = shared_library('example', src, - dependencies : [eina, efl, elm], + dependencies : [eina, efl], include_directories : inc, version : meson.project_version(), install : true diff --git a/tutorial/c/lib/src/test/meson.build b/tutorial/c/lib/src/test/meson.build index 3268e3a..b58df06 100644 --- a/tutorial/c/lib/src/test/meson.build +++ b/tutorial/c/lib/src/test/meson.build @@ -7,7 +7,7 @@ src = files([ check = dependency('check') exe = executable('example-test', src, - dependencies : [eina, efl, elm, check, example_lib], + dependencies : [eina, efl, check, example_lib], include_directories : inc, c_args : '-DPACKAGE_BUILD_DIR="' + meson.build_root() + '"', install : false diff --git a/tutorial/c/lib/src/test/runner.c b/tutorial/c/lib/src/test/runner.c index 9b81cf3..e140ad0 100644 --- a/tutorial/c/lib/src/test/runner.c +++ b/tutorial/c/lib/src/test/runner.c @@ -2,7 +2,7 @@ #define EFL_BETA_API_SUPPORT 1 #include <check.h> -#include <Elementary.h> +#include <Efl_Core.h> #include <Example.h> #include "suite.h" diff --git a/tutorial/c/lifecycle/meson.build b/tutorial/c/lifecycle/meson.build index f7976a9..4d27149 100644 --- a/tutorial/c/lifecycle/meson.build +++ b/tutorial/c/lifecycle/meson.build @@ -5,8 +5,7 @@ project( meson_version : '>= 0.38.0') eina = dependency('eina', version : '>=1.20.99') -efl = dependency('efl', version : '>=1.20.99') -elm = dependency('elementary', version : '>=1.20.99') +efl = dependency('efl-core', version : '>=1.20.99') inc = include_directories('.') subdir('src') diff --git a/tutorial/c/lifecycle/src/lifecycle_main.c b/tutorial/c/lifecycle/src/lifecycle_main.c index 0abb055..e3a8ba5 100644 --- a/tutorial/c/lifecycle/src/lifecycle_main.c +++ b/tutorial/c/lifecycle/src/lifecycle_main.c @@ -2,10 +2,9 @@ #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> -#include <Efl.h> -#include <Elementary.h> +#include <Efl_Core.h> -/* +/* * These are some helper methods for triggering lifecycle events for the purpose of this demo. * efl_pause and efl_resume may never be called for your application, depending on your environment. * This demo triggers them directly to show how you can respond. @@ -13,7 +12,7 @@ static void _method_delay_call(Efl_Event_Cb method, double delay, Efl_Loop *loop) { - efl_add(EFL_LOOP_TIMER_CLASS, loop, + efl_add(EFL_LOOP_TIMER_CLASS, loop, efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, method, loop), efl_loop_timer_interval_set(efl_added, delay)); } @@ -56,7 +55,7 @@ efl_resume(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { printf("Lifecycle: resumed\n"); } - + EAPI void efl_terminate(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) { diff --git a/tutorial/c/lifecycle/src/meson.build b/tutorial/c/lifecycle/src/meson.build index 82e4e0e..12c60ef 100644 --- a/tutorial/c/lifecycle/src/meson.build +++ b/tutorial/c/lifecycle/src/meson.build @@ -2,7 +2,7 @@ src = files([ 'lifecycle_main.c', ]) -deps = [eina, efl, elm] +deps = [eina, efl] executable('efl_example_lifecycle', src, dependencies : deps, --
