From 3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 26 Sep 2012 06:56:52 +0000 Subject: [PATCH] merge: add eo SVN revision: 77072 --- Makefile.am | 21 +-- configure.ac | 77 ++++++++++- legacy/eobj/eo.pc.in => eo.pc.in | 0 src/benchmarks/Makefile.am | 5 +- src/benchmarks/eo/Makefile.am | 29 ++++ .../benchmarks/eo}/class_simple.c | 0 .../benchmarks/eo}/class_simple.h | 0 .../benchmarks/eo}/eo_bench.c | 0 .../benchmarks/eo}/eo_bench.h | 0 .../benchmarks/eo}/eo_bench_eo_do.c | 0 src/examples/Makefile.am | 8 +- src/examples/eo/Makefile.am | 83 ++++++++++++ .../examples/eo/evas/evas_elw_box.c | 0 .../examples/eo/evas/evas_elw_box.h | 0 .../examples/eo/evas/evas_elw_boxedbutton.c | 0 .../examples/eo/evas/evas_elw_boxedbutton.h | 0 .../examples/eo/evas/evas_elw_button.c | 0 .../examples/eo/evas/evas_elw_button.h | 0 .../examples/eo/evas/evas_elw_win.c | 0 .../examples/eo/evas/evas_elw_win.h | 0 .../examples/eo/evas/evas_evas_obj.c | 0 .../examples/eo/evas/evas_evas_obj.h | 0 .../examples/eo/evas/evas_test.c | 0 .../examples/eo/isa/eo_isa_complex.c | 2 +- .../examples/eo/isa/eo_isa_complex.h | 2 +- .../examples/eo/isa/eo_isa_interface.c | 2 +- .../examples/eo/isa/eo_isa_interface.h | 0 .../examples/eo/isa/eo_isa_main.c | 4 +- .../examples/eo/isa/eo_isa_mixin.c | 4 +- .../examples/eo/isa/eo_isa_mixin.h | 0 .../examples/eo/isa/eo_isa_simple.c | 2 +- .../examples/eo/isa/eo_isa_simple.h | 4 +- src/examples/eo/simple/simple_interface.c | 29 ++++ src/examples/eo/simple/simple_interface.h | 26 ++++ .../examples/eo/simple/simple_main.c | 2 +- src/examples/eo/simple/simple_mixin.c | 53 ++++++++ src/examples/eo/simple/simple_mixin.h | 26 ++++ src/examples/eo/simple/simple_simple.c | 78 +++++++++++ src/examples/eo/simple/simple_simple.h | 35 +++++ src/lib/Makefile.am | 6 + {legacy/eobj/src/lib => src/lib/eo}/Eo.h | 0 src/lib/eo/Makefile.am | 21 +++ {legacy/eobj/src/lib => src/lib/eo}/eo.c | 0 .../src/lib => src/lib/eo}/eo_base_class.c | 0 .../eobj/src/lib => src/lib/eo}/eo_private.h | 0 src/tests/Makefile.am | 6 + src/tests/eo/Makefile.am | 126 ++++++++++++++++++ .../tests/eo/access/access_inherit.c | 7 +- .../tests/eo/access/access_inherit.h | 0 .../tests/eo/access/access_main.c | 4 +- .../tests/eo/access/access_simple.c | 4 +- .../tests/eo/access/access_simple.h | 0 .../tests/eo/access/access_simple_protected.h | 0 .../composite_objects_comp.c | 4 +- .../composite_objects_comp.h | 0 .../composite_objects_main.c | 4 +- .../composite_objects_simple.c | 2 +- .../composite_objects_simple.h | 0 .../tests/eo/constructors/constructors_main.c | 16 +-- .../eo/constructors/constructors_mixin.c | 4 +- .../eo/constructors/constructors_mixin.h | 0 .../eo/constructors/constructors_simple.c | 4 +- .../eo/constructors/constructors_simple.h | 0 .../eo/constructors/constructors_simple2.c | 4 +- .../eo/constructors/constructors_simple2.h | 0 .../eo/constructors/constructors_simple3.c | 4 +- .../eo/constructors/constructors_simple3.h | 0 .../eo/constructors/constructors_simple4.c | 6 +- .../eo/constructors/constructors_simple4.h | 0 .../eo/constructors/constructors_simple5.c | 4 +- .../eo/constructors/constructors_simple5.h | 0 .../eo/constructors/constructors_simple6.c | 4 +- .../eo/constructors/constructors_simple6.h | 0 .../eo/constructors/constructors_simple7.c | 6 +- .../eo/constructors/constructors_simple7.h | 0 .../src/tests => src/tests/eo}/eunit_tests.h | 0 .../function_overrides_inherit.c | 4 +- .../function_overrides_inherit.h | 0 .../function_overrides_inherit2.c | 6 +- .../function_overrides_inherit2.h | 0 .../function_overrides_inherit3.c | 6 +- .../function_overrides_inherit3.h | 0 .../function_overrides_main.c | 8 +- .../function_overrides_simple.c | 2 +- .../function_overrides_simple.h | 0 .../tests/eo/interface/interface_interface.c | 4 +- .../tests/eo/interface/interface_interface.h | 0 .../tests/eo/interface/interface_interface2.c | 6 +- .../tests/eo/interface/interface_interface2.h | 0 .../tests/eo/interface/interface_main.c | 6 +- .../tests/eo/interface/interface_simple.c | 6 +- .../tests/eo/interface/interface_simple.h | 0 .../tests/eo/mixin/mixin_inherit.c | 6 +- src/tests/eo/mixin/mixin_inherit.h | 7 + .../main.c => src/tests/eo/mixin/mixin_main.c | 10 +- .../tests/eo/mixin/mixin_mixin.c | 4 +- .../tests/eo/mixin/mixin_mixin.h | 0 .../tests/eo/mixin/mixin_mixin2.c | 6 +- .../tests/eo/mixin/mixin_mixin2.h | 0 .../tests/eo/mixin/mixin_mixin3.c | 6 +- .../tests/eo/mixin/mixin_mixin3.h | 0 .../tests/eo/mixin/mixin_mixin4.c | 6 +- .../tests/eo/mixin/mixin_mixin4.h | 0 .../tests/eo/mixin/mixin_simple.c | 8 +- src/tests/eo/mixin/mixin_simple.h | 47 +++++++ .../tests/eo/signals/signals_main.c | 2 +- .../tests/eo/signals/signals_simple.c | 2 +- .../tests/eo/signals/signals_simple.h | 0 .../tests/eo/suite}/eo_suite.c | 0 .../tests/eo/suite}/eo_suite.h | 0 .../tests/eo/suite}/eo_test_class_errors.c | 2 +- .../tests/eo/suite/eo_test_class_simple.c | 2 +- .../tests/eo/suite/eo_test_class_simple.h | 0 .../tests/eo/suite}/eo_test_general.c | 2 +- .../tests/eo/suite}/eo_test_init.c | 0 115 files changed, 772 insertions(+), 114 deletions(-) rename legacy/eobj/eo.pc.in => eo.pc.in (100%) create mode 100644 src/benchmarks/eo/Makefile.am rename {legacy/eobj/src/benchmarks => src/benchmarks/eo}/class_simple.c (100%) rename {legacy/eobj/src/benchmarks => src/benchmarks/eo}/class_simple.h (100%) rename {legacy/eobj/src/benchmarks => src/benchmarks/eo}/eo_bench.c (100%) rename {legacy/eobj/src/benchmarks => src/benchmarks/eo}/eo_bench.h (100%) rename {legacy/eobj/src/benchmarks => src/benchmarks/eo}/eo_bench_eo_do.c (100%) create mode 100644 src/examples/eo/Makefile.am rename legacy/eobj/src/examples/evas/elw_box.c => src/examples/eo/evas/evas_elw_box.c (100%) rename legacy/eobj/src/examples/evas/elw_box.h => src/examples/eo/evas/evas_elw_box.h (100%) rename legacy/eobj/src/examples/evas/elw_boxedbutton.c => src/examples/eo/evas/evas_elw_boxedbutton.c (100%) rename legacy/eobj/src/examples/evas/elw_boxedbutton.h => src/examples/eo/evas/evas_elw_boxedbutton.h (100%) rename legacy/eobj/src/examples/evas/elw_button.c => src/examples/eo/evas/evas_elw_button.c (100%) rename legacy/eobj/src/examples/evas/elw_button.h => src/examples/eo/evas/evas_elw_button.h (100%) rename legacy/eobj/src/examples/evas/elw_win.c => src/examples/eo/evas/evas_elw_win.c (100%) rename legacy/eobj/src/examples/evas/elw_win.h => src/examples/eo/evas/evas_elw_win.h (100%) rename legacy/eobj/src/examples/evas/evas_obj.c => src/examples/eo/evas/evas_evas_obj.c (100%) rename legacy/eobj/src/examples/evas/evas_obj.h => src/examples/eo/evas/evas_evas_obj.h (100%) rename legacy/eobj/src/examples/evas/test.c => src/examples/eo/evas/evas_test.c (100%) rename legacy/eobj/src/examples/eo_isa/complex.c => src/examples/eo/isa/eo_isa_complex.c (92%) rename legacy/eobj/src/examples/eo_isa/complex.h => src/examples/eo/isa/eo_isa_complex.h (84%) rename legacy/eobj/src/examples/simple/interface.c => src/examples/eo/isa/eo_isa_interface.c (95%) rename legacy/eobj/src/examples/eo_isa/interface.h => src/examples/eo/isa/eo_isa_interface.h (100%) rename legacy/eobj/src/examples/eo_isa/main.c => src/examples/eo/isa/eo_isa_main.c (93%) rename legacy/eobj/src/examples/eo_isa/mixin.c => src/examples/eo/isa/eo_isa_mixin.c (95%) rename legacy/eobj/src/examples/eo_isa/mixin.h => src/examples/eo/isa/eo_isa_mixin.h (100%) rename legacy/eobj/src/examples/eo_isa/simple.c => src/examples/eo/isa/eo_isa_simple.c (98%) rename legacy/eobj/src/examples/simple/simple.h => src/examples/eo/isa/eo_isa_simple.h (92%) create mode 100644 src/examples/eo/simple/simple_interface.c create mode 100644 src/examples/eo/simple/simple_interface.h rename legacy/eobj/src/examples/simple/main.c => src/examples/eo/simple/simple_main.c (94%) create mode 100644 src/examples/eo/simple/simple_mixin.c create mode 100644 src/examples/eo/simple/simple_mixin.h create mode 100644 src/examples/eo/simple/simple_simple.c create mode 100644 src/examples/eo/simple/simple_simple.h rename {legacy/eobj/src/lib => src/lib/eo}/Eo.h (100%) create mode 100644 src/lib/eo/Makefile.am rename {legacy/eobj/src/lib => src/lib/eo}/eo.c (100%) rename {legacy/eobj/src/lib => src/lib/eo}/eo_base_class.c (100%) rename {legacy/eobj/src/lib => src/lib/eo}/eo_private.h (100%) create mode 100644 src/tests/eo/Makefile.am rename legacy/eobj/src/tests/access/inherit.c => src/tests/eo/access/access_inherit.c (92%) rename legacy/eobj/src/tests/access/inherit.h => src/tests/eo/access/access_inherit.h (100%) rename legacy/eobj/src/tests/access/main.c => src/tests/eo/access/access_main.c (87%) rename legacy/eobj/src/tests/access/simple.c => src/tests/eo/access/access_simple.c (95%) rename legacy/eobj/src/tests/access/simple.h => src/tests/eo/access/access_simple.h (100%) rename legacy/eobj/src/tests/access/simple_protected.h => src/tests/eo/access/access_simple_protected.h (100%) rename legacy/eobj/src/tests/composite_objects/comp.c => src/tests/eo/composite_objects/composite_objects_comp.c (94%) rename legacy/eobj/src/tests/composite_objects/comp.h => src/tests/eo/composite_objects/composite_objects_comp.h (100%) rename legacy/eobj/src/tests/composite_objects/main.c => src/tests/eo/composite_objects/composite_objects_main.c (94%) rename legacy/eobj/src/tests/composite_objects/simple.c => src/tests/eo/composite_objects/composite_objects_simple.c (97%) rename legacy/eobj/src/tests/composite_objects/simple.h => src/tests/eo/composite_objects/composite_objects_simple.h (100%) rename legacy/eobj/src/tests/constructors/main.c => src/tests/eo/constructors/constructors_main.c (81%) rename legacy/eobj/src/tests/constructors/mixin.c => src/tests/eo/constructors/constructors_mixin.c (96%) rename legacy/eobj/src/tests/constructors/mixin.h => src/tests/eo/constructors/constructors_mixin.h (100%) rename legacy/eobj/src/tests/constructors/simple.c => src/tests/eo/constructors/constructors_simple.c (97%) rename legacy/eobj/src/tests/constructors/simple.h => src/tests/eo/constructors/constructors_simple.h (100%) rename legacy/eobj/src/tests/constructors/simple2.c => src/tests/eo/constructors/constructors_simple2.c (92%) rename legacy/eobj/src/tests/constructors/simple2.h => src/tests/eo/constructors/constructors_simple2.h (100%) rename legacy/eobj/src/tests/constructors/simple3.c => src/tests/eo/constructors/constructors_simple3.c (91%) rename legacy/eobj/src/tests/constructors/simple3.h => src/tests/eo/constructors/constructors_simple3.h (100%) rename legacy/eobj/src/tests/constructors/simple4.c => src/tests/eo/constructors/constructors_simple4.c (79%) rename legacy/eobj/src/tests/constructors/simple4.h => src/tests/eo/constructors/constructors_simple4.h (100%) rename legacy/eobj/src/tests/constructors/simple5.c => src/tests/eo/constructors/constructors_simple5.c (91%) rename legacy/eobj/src/tests/constructors/simple5.h => src/tests/eo/constructors/constructors_simple5.h (100%) rename legacy/eobj/src/tests/constructors/simple6.c => src/tests/eo/constructors/constructors_simple6.c (92%) rename legacy/eobj/src/tests/constructors/simple6.h => src/tests/eo/constructors/constructors_simple6.h (100%) rename legacy/eobj/src/tests/constructors/simple7.c => src/tests/eo/constructors/constructors_simple7.c (88%) rename legacy/eobj/src/tests/constructors/simple7.h => src/tests/eo/constructors/constructors_simple7.h (100%) rename {legacy/eobj/src/tests => src/tests/eo}/eunit_tests.h (100%) rename legacy/eobj/src/tests/function_overrides/inherit.c => src/tests/eo/function_overrides/function_overrides_inherit.c (82%) rename legacy/eobj/src/tests/function_overrides/inherit.h => src/tests/eo/function_overrides/function_overrides_inherit.h (100%) rename legacy/eobj/src/tests/function_overrides/inherit2.c => src/tests/eo/function_overrides/function_overrides_inherit2.c (94%) rename legacy/eobj/src/tests/function_overrides/inherit2.h => src/tests/eo/function_overrides/function_overrides_inherit2.h (100%) rename legacy/eobj/src/tests/function_overrides/inherit3.c => src/tests/eo/function_overrides/function_overrides_inherit3.c (87%) rename legacy/eobj/src/tests/function_overrides/inherit3.h => src/tests/eo/function_overrides/function_overrides_inherit3.h (100%) rename legacy/eobj/src/tests/function_overrides/main.c => src/tests/eo/function_overrides/function_overrides_main.c (88%) rename legacy/eobj/src/tests/function_overrides/simple.c => src/tests/eo/function_overrides/function_overrides_simple.c (98%) rename legacy/eobj/src/tests/function_overrides/simple.h => src/tests/eo/function_overrides/function_overrides_simple.h (100%) rename legacy/eobj/src/tests/interface/interface.c => src/tests/eo/interface/interface_interface.c (90%) rename legacy/eobj/src/tests/interface/interface.h => src/tests/eo/interface/interface_interface.h (100%) rename legacy/eobj/src/tests/interface/interface2.c => src/tests/eo/interface/interface_interface2.c (86%) rename legacy/eobj/src/tests/interface/interface2.h => src/tests/eo/interface/interface_interface2.h (100%) rename legacy/eobj/src/tests/interface/main.c => src/tests/eo/interface/interface_main.c (87%) rename legacy/eobj/src/tests/interface/simple.c => src/tests/eo/interface/interface_simple.c (96%) rename legacy/eobj/src/tests/interface/simple.h => src/tests/eo/interface/interface_simple.h (100%) rename legacy/eobj/src/tests/mixin/inherit.c => src/tests/eo/mixin/mixin_inherit.c (91%) create mode 100644 src/tests/eo/mixin/mixin_inherit.h rename legacy/eobj/src/tests/mixin/main.c => src/tests/eo/mixin/mixin_main.c (86%) rename legacy/eobj/src/tests/mixin/mixin.c => src/tests/eo/mixin/mixin_mixin.c (96%) rename legacy/eobj/src/tests/mixin/mixin.h => src/tests/eo/mixin/mixin_mixin.h (100%) rename legacy/eobj/src/tests/mixin/mixin2.c => src/tests/eo/mixin/mixin_mixin2.c (95%) rename legacy/eobj/src/tests/mixin/mixin2.h => src/tests/eo/mixin/mixin_mixin2.h (100%) rename legacy/eobj/src/tests/mixin/mixin3.c => src/tests/eo/mixin/mixin_mixin3.c (95%) rename legacy/eobj/src/tests/mixin/mixin3.h => src/tests/eo/mixin/mixin_mixin3.h (100%) rename legacy/eobj/src/tests/mixin/mixin4.c => src/tests/eo/mixin/mixin_mixin4.c (83%) rename legacy/eobj/src/tests/mixin/mixin4.h => src/tests/eo/mixin/mixin_mixin4.h (100%) rename legacy/eobj/src/tests/mixin/simple.c => src/tests/eo/mixin/mixin_simple.c (94%) create mode 100644 src/tests/eo/mixin/mixin_simple.h rename legacy/eobj/src/tests/signals/main.c => src/tests/eo/signals/signals_main.c (99%) rename legacy/eobj/src/tests/signals/simple.c => src/tests/eo/signals/signals_simple.c (98%) rename legacy/eobj/src/tests/signals/simple.h => src/tests/eo/signals/signals_simple.h (100%) rename {legacy/eobj/src/tests/eo_suite => src/tests/eo/suite}/eo_suite.c (100%) rename {legacy/eobj/src/tests/eo_suite => src/tests/eo/suite}/eo_suite.h (100%) rename {legacy/eobj/src/tests/eo_suite => src/tests/eo/suite}/eo_test_class_errors.c (99%) rename legacy/eobj/src/tests/eo_suite/class_simple.c => src/tests/eo/suite/eo_test_class_simple.c (98%) rename legacy/eobj/src/tests/eo_suite/class_simple.h => src/tests/eo/suite/eo_test_class_simple.h (100%) rename {legacy/eobj/src/tests/eo_suite => src/tests/eo/suite}/eo_test_general.c (99%) rename {legacy/eobj/src/tests/eo_suite => src/tests/eo/suite}/eo_test_init.c (100%) diff --git a/Makefile.am b/Makefile.am index a1f81df2ef..e3f8375a83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,15 +31,11 @@ m4/efl_threads.m4 \ m4/evil_windows.m4 \ m4/eina_check.m4 -if HAVE_WINDOWS EXTRA_DIST += \ ChangeLog.evil \ NEWS.evil \ README.evil \ -evil.pc -endif - -EXTRA_DIST += \ +evil.pc \ ChangeLog.eina \ NEWS.eina \ README.eina \ @@ -49,7 +45,8 @@ ChangeLog.eet \ NEWS.eet \ README.eet \ eet.spec \ -eet.pc +eet.pc \ +eo.pc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @@ -64,6 +61,10 @@ if EFL_BUILD_EET pkgconfig_DATA += eet.pc endif +if EFL_BUILD_EO +pkgconfig_DATA += eo.pc +endif + .PHONY: doc benchmark examples install-examples @@ -97,10 +98,12 @@ check-local: if EFL_ENABLE_COVERAGE @$(MAKE) $(AM_MAKEFLAGS) lcov-reset endif - @./src/tests/eina/eina_suite$(EXEEXT) if EFL_BUILD_EET @./src/tests/eet/eet_suite$(EXEEXT) endif +if EFL_BUILD_EO + @./src/tests/eo/eo_suite$(EXEEXT) +endif if EFL_ENABLE_COVERAGE @$(MAKE) $(AM_MAKEFLAGS) lcov-report endif @@ -112,7 +115,9 @@ endif benchmark: @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark @mkdir benchmark || true - @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s` +if EFL_BUILD_EO + @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s` +endif benchmark-e17: @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 diff --git a/configure.ac b/configure.ac index a957637542..380b8fda85 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,6 @@ AC_SUBST([VMAJ]) #### Default values -want_eina="yes" -want_eet="yes" want_evas="yes" want_ecore="yes" want_embryo="yes" @@ -97,6 +95,7 @@ requirements_libs_deps_elementary="" requirements_pc_eina="" requirements_pc_eet="" +requirements_pc_eo="" requirements_pc_evas="" requirements_pc_ecore="" requirements_pc_embryo="" @@ -140,6 +139,7 @@ AC_SUBST([requirements_libs_elementary]) AC_SUBST([requirements_pc_eina]) AC_SUBST([requirements_pc_eet]) +AC_SUBST([requirements_pc_eo]) AC_SUBST([requirements_pc_evas]) AC_SUBST([requirements_pc_ecore]) AC_SUBST([requirements_pc_embryo]) @@ -197,6 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) #### Additional options to configure EFL_ENABLE_LIB([eet], [yes]) +EFL_ENABLE_LIB([eo], [yes]) # Assert or fail. @@ -1141,6 +1142,62 @@ fi #### End of Eet +#### Eo + +efl_have_eo="no" + +if test "x${efl_want_build_eo}" = "xyes" ; then + +AC_MSG_NOTICE([Eo checks]) + +### Default values + +### Additional options to configure + +### Checks for programs + +### Checks for libraries + +# Eina library + +requirements_pc_eo="eina >= 1.7.99" + +PKG_CHECK_MODULES([EO], [${requirements_pc_eo}]) + +# Example (evas one) + +PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) +AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) + +### Checks for header files + +### Checks for types + +### Checks for structures + +### Checks for compiler characteristics + +EFL_EO_BUILD="" +case "$host_os" in + mingw*) + EFL_EO_BUILD="-DEFL_EO_BUILD" + ;; +esac +AC_SUBST([EFL_EO_BUILD]) + +### Checks for linker characteristics + +### Checks for library functions + +### Check availability + +efl_have_eo="yes" + +fi + +#### End of Eo + + #### Evas #AC_MSG_NOTICE([Evas checks]) @@ -1166,12 +1223,14 @@ doc/Doxyfile src/Makefile src/benchmarks/Makefile src/benchmarks/eina/Makefile +src/benchmarks/eo/Makefile src/bin/Makefile src/bin/evil/Makefile src/bin/eet/Makefile src/examples/Makefile src/examples/eina/Makefile src/examples/eet/Makefile +src/examples/eo/Makefile src/include/Makefile src/include/eina/Makefile src/include/eina/eina_config.h @@ -1179,6 +1238,7 @@ src/lib/Makefile src/lib/evil/Makefile src/lib/eina/Makefile src/lib/eet/Makefile +src/lib/eo/Makefile src/modules/Makefile src/modules/eina/Makefile src/modules/eina/mp/Makefile @@ -1194,11 +1254,13 @@ src/scripts/eina/Makefile src/tests/Makefile src/tests/eina/Makefile src/tests/eet/Makefile +src/tests/eo/Makefile eina.spec eet.spec evil.pc eina.pc eet.pc +eo.pc ]) AC_OUTPUT @@ -1263,6 +1325,7 @@ echo " Pass through.......: ${enable_pass_through}" echo if test "x${efl_have_eet}" = "xno" ; then echo "Eet....................: no" +echo else echo "Eet" echo @@ -1278,6 +1341,16 @@ echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" echo " Examples.............: make examples" echo " installation.......: make install-examples" fi +if test "x${efl_have_eo}" = "xno" ; then +echo "Eo.....................: no" +echo +else +echo "Eo" +echo +echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" +echo " Examples.............: make examples" +echo " installation.......: make install-examples" +fi echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" diff --git a/legacy/eobj/eo.pc.in b/eo.pc.in similarity index 100% rename from legacy/eobj/eo.pc.in rename to eo.pc.in diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am index b16aab1fd7..15fa26cece 100644 --- a/src/benchmarks/Makefile.am +++ b/src/benchmarks/Makefile.am @@ -1,11 +1,14 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = eina +SUBDIRS = eina eo .PHONY: benchmark benchmark-e17 benchmark: @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark +if EFL_BUILD_EO + @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark +endif benchmark-e17: @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am new file mode 100644 index 0000000000..e0f9e4c0f3 --- /dev/null +++ b/src/benchmarks/eo/Makefile.am @@ -0,0 +1,29 @@ + +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src/include/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/include/eina \ +-I$(top_builddir)/src/lib/eo \ +@EFL_EO_BUILD@ \ +@EO_CFLAGS@ + +EXTRA_PROGRAMS = eo_bench + +benchmark: eo_bench + +eo_bench_SOURCES = \ +class_simple.c \ +class_simple.h \ +eo_bench.c \ +eo_bench.h \ +eo_bench_eo_do.c + +eo_bench_LDADD = \ +$(top_builddir)/src/lib/eo/libeo.la \ +$(top_builddir)/src/lib/eina/libeina.la \ +@EO_LIBS@ + +clean-local: + rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda diff --git a/legacy/eobj/src/benchmarks/class_simple.c b/src/benchmarks/eo/class_simple.c similarity index 100% rename from legacy/eobj/src/benchmarks/class_simple.c rename to src/benchmarks/eo/class_simple.c diff --git a/legacy/eobj/src/benchmarks/class_simple.h b/src/benchmarks/eo/class_simple.h similarity index 100% rename from legacy/eobj/src/benchmarks/class_simple.h rename to src/benchmarks/eo/class_simple.h diff --git a/legacy/eobj/src/benchmarks/eo_bench.c b/src/benchmarks/eo/eo_bench.c similarity index 100% rename from legacy/eobj/src/benchmarks/eo_bench.c rename to src/benchmarks/eo/eo_bench.c diff --git a/legacy/eobj/src/benchmarks/eo_bench.h b/src/benchmarks/eo/eo_bench.h similarity index 100% rename from legacy/eobj/src/benchmarks/eo_bench.h rename to src/benchmarks/eo/eo_bench.h diff --git a/legacy/eobj/src/benchmarks/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c similarity index 100% rename from legacy/eobj/src/benchmarks/eo_bench_eo_do.c rename to src/benchmarks/eo/eo_bench_eo_do.c diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index abdebd74f9..0a874138fb 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -1,15 +1,21 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = eina eet +SUBDIRS = eina eet eo examples: @$(MAKE) $(AM_MAKEFLAGS) -C eina examples if EFL_BUILD_EET @$(MAKE) $(AM_MAKEFLAGS) -C eet examples endif +if EFL_BUILD_EO + @$(MAKE) $(AM_MAKEFLAGS) -C eo examples +endif install-examples: @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples if EFL_BUILD_EET @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples endif +if EFL_BUILD_EO + @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples +endif diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am new file mode 100644 index 0000000000..d7719be5b8 --- /dev/null +++ b/src/examples/eo/Makefile.am @@ -0,0 +1,83 @@ +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ +@EFL_EO_BUILD@ \ +@EO_CFLAGS@ + +EXTRA_PROGRAMS = eo_isa eo_simple + +if EO_BUILD_EXAMPLE_EVAS + +EXTRA_PROGRAMS += eo_evas + +endif + +eo_isa_SOURCES = \ +isa/eo_isa_complex.c \ +isa/eo_isa_complex.h \ +isa/eo_isa_interface.c \ +isa/eo_isa_interface.h \ +isa/eo_isa_main.c \ +isa/eo_isa_mixin.c \ +isa/eo_isa_mixin.h \ +isa/eo_isa_simple.c \ +isa/eo_isa_simple.h + +eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +if EO_BUILD_EXAMPLE_EVAS + +eo_evas_SOURCES = \ +evas/evas_elw_box.c \ +evas/evas_elw_box.h \ +evas/evas_elw_boxedbutton.c \ +evas/evas_elw_boxedbutton.h \ +evas/evas_elw_button.c \ +evas/evas_elw_button.h \ +evas/evas_elw_win.h \ +evas/evas_elw_win.c \ +evas/evas_evas_obj.c \ +evas/evas_evas_obj.h \ +evas/evas_test.c + +eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LIBS@ + +endif + +eo_simple_SOURCES = \ +simple/simple_interface.c \ +simple/simple_interface.h \ +simple/simple_main.c \ +simple/simple_mixin.c \ +simple/simple_mixin.h \ +simple/simple_simple.c \ +simple/simple_simple.h + +eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +examples: $(EXTRA_PROGRAMS) + +clean-local: + rm -f $(EXTRA_PROGRAMS) + +install-examples: + mkdir -p $(pkgdatadir)/examples/eo/isa + $(install_sh_DATA) -c $(eo_isa_SOURCES) $(pkgdatadir)/examples/eo/isa + mkdir -p $(pkgdatadir)/examples/eo/evas + $(install_sh_DATA) -c $(evas_SOURCES) $(pkgdatadir)/examples/eo/evas + mkdir -p $(pkgdatadir)/examples/eo/simple + $(install_sh_DATA) -c $(simple_SOURCES) $(pkgdatadir)/examples/eo/simple + +uninstall-local: + for f in $(eo_isa_SOURCES) ; do \ + rm -f $(pkgdatadir)/examples/eo/isa/$$f ; \ + done + for f in $(evas_SOURCES) ; do \ + rm -f $(pkgdatadir)/examples/eo/evas/$$f ; \ + done + for f in $(simple_SOURCES) ; do \ + rm -f $(pkgdatadir)/examples/eo/simple/$$f ; \ + done diff --git a/legacy/eobj/src/examples/evas/elw_box.c b/src/examples/eo/evas/evas_elw_box.c similarity index 100% rename from legacy/eobj/src/examples/evas/elw_box.c rename to src/examples/eo/evas/evas_elw_box.c diff --git a/legacy/eobj/src/examples/evas/elw_box.h b/src/examples/eo/evas/evas_elw_box.h similarity index 100% rename from legacy/eobj/src/examples/evas/elw_box.h rename to src/examples/eo/evas/evas_elw_box.h diff --git a/legacy/eobj/src/examples/evas/elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c similarity index 100% rename from legacy/eobj/src/examples/evas/elw_boxedbutton.c rename to src/examples/eo/evas/evas_elw_boxedbutton.c diff --git a/legacy/eobj/src/examples/evas/elw_boxedbutton.h b/src/examples/eo/evas/evas_elw_boxedbutton.h similarity index 100% rename from legacy/eobj/src/examples/evas/elw_boxedbutton.h rename to src/examples/eo/evas/evas_elw_boxedbutton.h diff --git a/legacy/eobj/src/examples/evas/elw_button.c b/src/examples/eo/evas/evas_elw_button.c similarity index 100% rename from legacy/eobj/src/examples/evas/elw_button.c rename to src/examples/eo/evas/evas_elw_button.c diff --git a/legacy/eobj/src/examples/evas/elw_button.h b/src/examples/eo/evas/evas_elw_button.h similarity index 100% rename from legacy/eobj/src/examples/evas/elw_button.h rename to src/examples/eo/evas/evas_elw_button.h diff --git a/legacy/eobj/src/examples/evas/elw_win.c b/src/examples/eo/evas/evas_elw_win.c similarity index 100% rename from legacy/eobj/src/examples/evas/elw_win.c rename to src/examples/eo/evas/evas_elw_win.c diff --git a/legacy/eobj/src/examples/evas/elw_win.h b/src/examples/eo/evas/evas_elw_win.h similarity index 100% rename from legacy/eobj/src/examples/evas/elw_win.h rename to src/examples/eo/evas/evas_elw_win.h diff --git a/legacy/eobj/src/examples/evas/evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c similarity index 100% rename from legacy/eobj/src/examples/evas/evas_obj.c rename to src/examples/eo/evas/evas_evas_obj.c diff --git a/legacy/eobj/src/examples/evas/evas_obj.h b/src/examples/eo/evas/evas_evas_obj.h similarity index 100% rename from legacy/eobj/src/examples/evas/evas_obj.h rename to src/examples/eo/evas/evas_evas_obj.h diff --git a/legacy/eobj/src/examples/evas/test.c b/src/examples/eo/evas/evas_test.c similarity index 100% rename from legacy/eobj/src/examples/evas/test.c rename to src/examples/eo/evas/evas_test.c diff --git a/legacy/eobj/src/examples/eo_isa/complex.c b/src/examples/eo/isa/eo_isa_complex.c similarity index 92% rename from legacy/eobj/src/examples/eo_isa/complex.c rename to src/examples/eo/isa/eo_isa_complex.c index e21068cb11..4e4ff3e2c9 100644 --- a/legacy/eobj/src/examples/eo_isa/complex.c +++ b/src/examples/eo/isa/eo_isa_complex.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "complex.h" +#include "eo_isa_complex.h" #define MY_CLASS COMPLEX_CLASS diff --git a/legacy/eobj/src/examples/eo_isa/complex.h b/src/examples/eo/isa/eo_isa_complex.h similarity index 84% rename from legacy/eobj/src/examples/eo_isa/complex.h rename to src/examples/eo/isa/eo_isa_complex.h index 29a0cea5a3..035eca0741 100644 --- a/legacy/eobj/src/examples/eo_isa/complex.h +++ b/src/examples/eo/isa/eo_isa_complex.h @@ -2,7 +2,7 @@ #define COMPLEX_H #include "Eo.h" -#include "simple.h" +#include "eo_isa_simple.h" #define COMPLEX_CLASS complex_class_get() const Eo_Class *complex_class_get(void); diff --git a/legacy/eobj/src/examples/simple/interface.c b/src/examples/eo/isa/eo_isa_interface.c similarity index 95% rename from legacy/eobj/src/examples/simple/interface.c rename to src/examples/eo/isa/eo_isa_interface.c index a1a130957a..8009012e21 100644 --- a/legacy/eobj/src/examples/simple/interface.c +++ b/src/examples/eo/isa/eo_isa_interface.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "interface.h" +#include "eo_isa_interface.h" EAPI Eo_Op INTERFACE_BASE_ID = 0; diff --git a/legacy/eobj/src/examples/eo_isa/interface.h b/src/examples/eo/isa/eo_isa_interface.h similarity index 100% rename from legacy/eobj/src/examples/eo_isa/interface.h rename to src/examples/eo/isa/eo_isa_interface.h diff --git a/legacy/eobj/src/examples/eo_isa/main.c b/src/examples/eo/isa/eo_isa_main.c similarity index 93% rename from legacy/eobj/src/examples/eo_isa/main.c rename to src/examples/eo/isa/eo_isa_main.c index 517e1bd0a3..567ef32542 100644 --- a/legacy/eobj/src/examples/eo_isa/main.c +++ b/src/examples/eo/isa/eo_isa_main.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "simple.h" -#include "complex.h" +#include "eo_isa_simple.h" +#include "eo_isa_complex.h" int main(int argc, char *argv[]) diff --git a/legacy/eobj/src/examples/eo_isa/mixin.c b/src/examples/eo/isa/eo_isa_mixin.c similarity index 95% rename from legacy/eobj/src/examples/eo_isa/mixin.c rename to src/examples/eo/isa/eo_isa_mixin.c index 458dd084b1..71f1d859cc 100644 --- a/legacy/eobj/src/examples/eo_isa/mixin.c +++ b/src/examples/eo/isa/eo_isa_mixin.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple.h" +#include "eo_isa_mixin.h" +#include "eo_isa_simple.h" EAPI Eo_Op MIXIN_BASE_ID = 0; diff --git a/legacy/eobj/src/examples/eo_isa/mixin.h b/src/examples/eo/isa/eo_isa_mixin.h similarity index 100% rename from legacy/eobj/src/examples/eo_isa/mixin.h rename to src/examples/eo/isa/eo_isa_mixin.h diff --git a/legacy/eobj/src/examples/eo_isa/simple.c b/src/examples/eo/isa/eo_isa_simple.c similarity index 98% rename from legacy/eobj/src/examples/eo_isa/simple.c rename to src/examples/eo/isa/eo_isa_simple.c index 00016e5171..789c5f4711 100644 --- a/legacy/eobj/src/examples/eo_isa/simple.c +++ b/src/examples/eo/isa/eo_isa_simple.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "simple.h" +#include "eo_isa_simple.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/legacy/eobj/src/examples/simple/simple.h b/src/examples/eo/isa/eo_isa_simple.h similarity index 92% rename from legacy/eobj/src/examples/simple/simple.h rename to src/examples/eo/isa/eo_isa_simple.h index e18f11d7d6..eead797238 100644 --- a/legacy/eobj/src/examples/simple/simple.h +++ b/src/examples/eo/isa/eo_isa_simple.h @@ -2,8 +2,8 @@ #define SIMPLE_H #include "Eo.h" -#include "interface.h" -#include "mixin.h" +#include "eo_isa_interface.h" +#include "eo_isa_mixin.h" extern EAPI Eo_Op SIMPLE_BASE_ID; diff --git a/src/examples/eo/simple/simple_interface.c b/src/examples/eo/simple/simple_interface.c new file mode 100644 index 0000000000..e59107267a --- /dev/null +++ b/src/examples/eo/simple/simple_interface.c @@ -0,0 +1,29 @@ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "Eo.h" +#include "simple_interface.h" + +EAPI Eo_Op INTERFACE_BASE_ID = 0; + +#define MY_CLASS INTERFACE_CLASS + +static const Eo_Op_Description op_desc[] = { + EO_OP_DESCRIPTION(INTERFACE_SUB_ID_A_POWER_3_GET, "Get the a^3"), + EO_OP_DESCRIPTION_SENTINEL +}; + +static const Eo_Class_Description class_desc = { + EO_VERSION, + "Interface", + EO_CLASS_TYPE_INTERFACE, + EO_CLASS_DESCRIPTION_OPS(&INTERFACE_BASE_ID, op_desc, INTERFACE_SUB_ID_LAST), + NULL, + 0, + NULL, + NULL +}; + +EO_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL) + diff --git a/src/examples/eo/simple/simple_interface.h b/src/examples/eo/simple/simple_interface.h new file mode 100644 index 0000000000..c5bf43e135 --- /dev/null +++ b/src/examples/eo/simple/simple_interface.h @@ -0,0 +1,26 @@ +#ifndef INTERFACE_H +#define INTERFACE_H + +#include "Eo.h" + +extern EAPI Eo_Op INTERFACE_BASE_ID; + +enum { + INTERFACE_SUB_ID_A_POWER_3_GET, + INTERFACE_SUB_ID_LAST +}; + +#define INTERFACE_ID(sub_id) (INTERFACE_BASE_ID + sub_id) + + +/** + * @def interface_a_power_3_get(ret) + * @brief Get a^3 + * @param[out] ret integer pointer to ret - value + */ +#define interface_a_power_3_get(ret) INTERFACE_ID(INTERFACE_SUB_ID_A_POWER_3_GET), EO_TYPECHECK(int *, ret) + +#define INTERFACE_CLASS interface_class_get() +const Eo_Class *interface_class_get(void); + +#endif diff --git a/legacy/eobj/src/examples/simple/main.c b/src/examples/eo/simple/simple_main.c similarity index 94% rename from legacy/eobj/src/examples/simple/main.c rename to src/examples/eo/simple/simple_main.c index 95c352a563..a93a5e37d2 100644 --- a/legacy/eobj/src/examples/simple/main.c +++ b/src/examples/eo/simple/simple_main.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "simple.h" +#include "simple_simple.h" int main(int argc, char *argv[]) diff --git a/src/examples/eo/simple/simple_mixin.c b/src/examples/eo/simple/simple_mixin.c new file mode 100644 index 0000000000..389b0891f9 --- /dev/null +++ b/src/examples/eo/simple/simple_mixin.c @@ -0,0 +1,53 @@ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "Eo.h" +#include "simple_mixin.h" +#include "simple_simple.h" + +EAPI Eo_Op MIXIN_BASE_ID = 0; + +#define MY_CLASS MIXIN_CLASS + +static void +_a_square_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list) +{ + int a; + eo_do(obj, simple_a_get(&a)); + int *ret = va_arg(*list, int *); + if (ret) + *ret = a * a; + printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); +} + +static void +_class_constructor(Eo_Class *klass) +{ + const Eo_Op_Func_Description func_desc[] = { + EO_OP_FUNC(MIXIN_ID(MIXIN_SUB_ID_A_SQUARE_GET), _a_square_get), + EO_OP_FUNC_SENTINEL + }; + + eo_class_funcs_set(klass, func_desc); +} + + +static const Eo_Op_Description op_desc[] = { + EO_OP_DESCRIPTION(MIXIN_SUB_ID_A_SQUARE_GET, "Get the value of A^2"), + EO_OP_DESCRIPTION_SENTINEL +}; + +static const Eo_Class_Description class_desc = { + EO_VERSION, + "Mixin", + EO_CLASS_TYPE_MIXIN, + EO_CLASS_DESCRIPTION_OPS(&MIXIN_BASE_ID, op_desc, MIXIN_SUB_ID_LAST), + NULL, + 0, + _class_constructor, + NULL +}; + +EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, NULL) + diff --git a/src/examples/eo/simple/simple_mixin.h b/src/examples/eo/simple/simple_mixin.h new file mode 100644 index 0000000000..539504d3ad --- /dev/null +++ b/src/examples/eo/simple/simple_mixin.h @@ -0,0 +1,26 @@ +#ifndef MIXIN_H +#define MIXIN_H + +#include "Eo.h" + +extern EAPI Eo_Op MIXIN_BASE_ID; + +enum { + MIXIN_SUB_ID_A_SQUARE_GET, + MIXIN_SUB_ID_LAST +}; + +#define MIXIN_ID(sub_id) (MIXIN_BASE_ID + sub_id) + + +/** + * @def mixin_a_square_get(ret) + * @brief Get the square of a. + * @param[out] ret the square of a + */ +#define mixin_a_square_get(ret) MIXIN_ID(MIXIN_SUB_ID_A_SQUARE_GET), EO_TYPECHECK(int *, ret) + +#define MIXIN_CLASS mixin_class_get() +const Eo_Class *mixin_class_get(void); + +#endif diff --git a/src/examples/eo/simple/simple_simple.c b/src/examples/eo/simple/simple_simple.c new file mode 100644 index 0000000000..a172bce3fc --- /dev/null +++ b/src/examples/eo/simple/simple_simple.c @@ -0,0 +1,78 @@ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "Eo.h" +#include "simple_simple.h" + +EAPI Eo_Op SIMPLE_BASE_ID = 0; + +typedef struct +{ + int a; +} Private_Data; + +#define MY_CLASS SIMPLE_CLASS + +static void +_a_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list) +{ + const Private_Data *pd = class_data; + int *a; + a = va_arg(*list, int *); + *a = pd->a; + printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); +} + +static void +_a_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list) +{ + Private_Data *pd = class_data; + int a; + a = va_arg(*list, int); + pd->a = a; + printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); +} + +static void +_a_power_3_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list) +{ + const Private_Data *pd = class_data; + int *ret; + ret = va_arg(*list, int *); + if (ret) + *ret = pd->a * pd->a * pd->a; + printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); +} + +static void +_class_constructor(Eo_Class *klass) +{ + const Eo_Op_Func_Description func_desc[] = { + EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set), + EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_GET), _a_get), + EO_OP_FUNC(INTERFACE_ID(INTERFACE_SUB_ID_A_POWER_3_GET), _a_power_3_get), + EO_OP_FUNC_SENTINEL + }; + + eo_class_funcs_set(klass, func_desc); +} + +static const Eo_Op_Description op_desc[] = { + EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"), + EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_GET, "Get property A"), + EO_OP_DESCRIPTION_SENTINEL +}; + +static const Eo_Class_Description class_desc = { + EO_VERSION, + "Simple", + EO_CLASS_TYPE_REGULAR, + EO_CLASS_DESCRIPTION_OPS(&SIMPLE_BASE_ID, op_desc, SIMPLE_SUB_ID_LAST), + NULL, + sizeof(Private_Data), + _class_constructor, + NULL +}; + +EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL); diff --git a/src/examples/eo/simple/simple_simple.h b/src/examples/eo/simple/simple_simple.h new file mode 100644 index 0000000000..36d4a00713 --- /dev/null +++ b/src/examples/eo/simple/simple_simple.h @@ -0,0 +1,35 @@ +#ifndef SIMPLE_H +#define SIMPLE_H + +#include "Eo.h" +#include "simple_interface.h" +#include "simple_mixin.h" + +extern EAPI Eo_Op SIMPLE_BASE_ID; + +enum { + SIMPLE_SUB_ID_A_SET, + SIMPLE_SUB_ID_A_GET, + SIMPLE_SUB_ID_LAST +}; + +#define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id) + +/** + * @def simple_a_set(a) + * @brief Set value to a-property + * @param[in] a integer value to set + */ +#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a) + +/** + * @def simple_a_get(a) + * @brief Get value of a-property + * @param[out] integer pointer to a-value + */ +#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a) + +#define SIMPLE_CLASS simple_class_get() +const Eo_Class *simple_class_get(void); + +#endif diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 24591e5676..e715faa107 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -15,3 +15,9 @@ if EFL_BUILD_EET SUBDIRS += eet endif + +if EFL_BUILD_EO + +SUBDIRS += eo + +endif diff --git a/legacy/eobj/src/lib/Eo.h b/src/lib/eo/Eo.h similarity index 100% rename from legacy/eobj/src/lib/Eo.h rename to src/lib/eo/Eo.h diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am new file mode 100644 index 0000000000..0580bc0482 --- /dev/null +++ b/src/lib/eo/Makefile.am @@ -0,0 +1,21 @@ +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src/include/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/include/eina \ +-I$(top_builddir)/src/lib/eo \ +@EFL_EO_BUILD@ \ +@EO_CFLAGS@ + +installed_headerdir = $(includedir)/eo-@VMAJ@ +dist_installed_header_DATA = Eo.h + +lib_LTLIBRARIES = libeo.la + +libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h +libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@ +libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ + +clean-local: + rm -rf *.gcno diff --git a/legacy/eobj/src/lib/eo.c b/src/lib/eo/eo.c similarity index 100% rename from legacy/eobj/src/lib/eo.c rename to src/lib/eo/eo.c diff --git a/legacy/eobj/src/lib/eo_base_class.c b/src/lib/eo/eo_base_class.c similarity index 100% rename from legacy/eobj/src/lib/eo_base_class.c rename to src/lib/eo/eo_base_class.c diff --git a/legacy/eobj/src/lib/eo_private.h b/src/lib/eo/eo_private.h similarity index 100% rename from legacy/eobj/src/lib/eo_private.h rename to src/lib/eo/eo_private.h diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 8d718c8085..4598ce34a7 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -7,3 +7,9 @@ if EFL_BUILD_EET SUBDIRS += eet endif + +if EFL_BUILD_EO + +SUBDIRS += eo + +endif diff --git a/src/tests/eo/Makefile.am b/src/tests/eo/Makefile.am new file mode 100644 index 0000000000..15241bb087 --- /dev/null +++ b/src/tests/eo/Makefile.am @@ -0,0 +1,126 @@ +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ +@EFL_EO_BUILD@ \ +@EO_CFLAGS@ \ +@CHECK_CFLAGS@ + +check_PROGRAMS = \ +test_access \ +test_composite_objects \ +test_constructors \ +test_function_overrides \ +test_interface \ +test_mixin \ +test_signals + +if EFL_ENABLE_TESTS +check_PROGRAMS += eo_suite +endif + +test_access_SOURCES = \ +access/access_inherit.c \ +access/access_inherit.h \ +access/access_main.c \ +access/access_simple.c \ +access/access_simple.h \ +access/access_simple_protected.h + +test_access_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +test_composite_objects_SOURCES = \ +composite_objects/composite_objects_comp.c \ +composite_objects/composite_objects_comp.h \ +composite_objects/composite_objects_main.c \ +composite_objects/composite_objects_simple.c \ +composite_objects/composite_objects_simple.h + +test_composite_objects_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +test_constructors_SOURCES = \ +constructors/constructors_main.c \ +constructors/constructors_mixin.c \ +constructors/constructors_mixin.h \ +constructors/constructors_simple.c \ +constructors/constructors_simple.h \ +constructors/constructors_simple2.c \ +constructors/constructors_simple2.h \ +constructors/constructors_simple3.c \ +constructors/constructors_simple3.h \ +constructors/constructors_simple4.c \ +constructors/constructors_simple4.h \ +constructors/constructors_simple5.c \ +constructors/constructors_simple5.h \ +constructors/constructors_simple6.c \ +constructors/constructors_simple6.h \ +constructors/constructors_simple7.c \ +constructors/constructors_simple7.h + +test_constructors_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +if EFL_ENABLE_TESTS + +eo_suite_SOURCES = \ +suite/eo_test_class_simple.c \ +suite/eo_test_class_simple.h \ +suite/eo_suite.c \ +suite/eo_suite.h \ +suite/eo_test_class_errors.c \ +suite/eo_test_general.c \ +suite/eo_test_init.c + +eo_suite_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ @CHECK_LIBS@ + +endif + +test_function_overrides_SOURCES = \ +function_overrides/function_overrides_inherit.c \ +function_overrides/function_overrides_inherit.h \ +function_overrides/function_overrides_inherit2.c \ +function_overrides/function_overrides_inherit2.h \ +function_overrides/function_overrides_inherit3.c \ +function_overrides/function_overrides_inherit3.h \ +function_overrides/function_overrides_main.c \ +function_overrides/function_overrides_simple.c \ +function_overrides/function_overrides_simple.h + +test_function_overrides_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +test_interface_SOURCES = \ +interface/interface_interface.c \ +interface/interface_interface.h \ +interface/interface_interface2.c \ +interface/interface_interface2.h \ +interface/interface_main.c \ +interface/interface_simple.c \ +interface/interface_simple.h + +test_interface_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +test_mixin_SOURCES = \ +mixin/mixin_inherit.c \ +mixin/mixin_inherit.h \ +mixin/mixin_main.c \ +mixin/mixin_mixin.c \ +mixin/mixin_mixin.h \ +mixin/mixin_mixin2.c \ +mixin/mixin_mixin2.h \ +mixin/mixin_mixin3.c \ +mixin/mixin_mixin3.h \ +mixin/mixin_mixin4.c \ +mixin/mixin_mixin4.h \ +mixin/mixin_simple.c \ +mixin/mixin_simple.h + +test_mixin_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +test_signals_SOURCES = \ +signals/signals_main.c \ +signals/signals_simple.c \ +signals/signals_simple.h + +test_signals_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ + +EXTRA_DIST = eunit_tests.h diff --git a/legacy/eobj/src/tests/access/inherit.c b/src/tests/eo/access/access_inherit.c similarity index 92% rename from legacy/eobj/src/tests/access/inherit.c rename to src/tests/eo/access/access_inherit.c index 2c7d4f0849..4d1c81efcd 100644 --- a/legacy/eobj/src/tests/access/inherit.c +++ b/src/tests/eo/access/access_inherit.c @@ -3,10 +3,9 @@ #endif #include "Eo.h" -#include "simple.h" -#include "simple_protected.h" - -#include "inherit.h" +#include "access_simple.h" +#include "access_simple_protected.h" +#include "access_inherit.h" EAPI Eo_Op INHERIT_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/access/inherit.h b/src/tests/eo/access/access_inherit.h similarity index 100% rename from legacy/eobj/src/tests/access/inherit.h rename to src/tests/eo/access/access_inherit.h diff --git a/legacy/eobj/src/tests/access/main.c b/src/tests/eo/access/access_main.c similarity index 87% rename from legacy/eobj/src/tests/access/main.c rename to src/tests/eo/access/access_main.c index c211698d83..474f3b9a49 100644 --- a/legacy/eobj/src/tests/access/main.c +++ b/src/tests/eo/access/access_main.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "simple.h" -#include "inherit.h" +#include "access_simple.h" +#include "access_inherit.h" int main(int argc, char *argv[]) diff --git a/legacy/eobj/src/tests/access/simple.c b/src/tests/eo/access/access_simple.c similarity index 95% rename from legacy/eobj/src/tests/access/simple.c rename to src/tests/eo/access/access_simple.c index ffa66ccb08..42fa259e40 100644 --- a/legacy/eobj/src/tests/access/simple.c +++ b/src/tests/eo/access/access_simple.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "simple.h" -#include "simple_protected.h" +#include "access_simple.h" +#include "access_simple_protected.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/access/simple.h b/src/tests/eo/access/access_simple.h similarity index 100% rename from legacy/eobj/src/tests/access/simple.h rename to src/tests/eo/access/access_simple.h diff --git a/legacy/eobj/src/tests/access/simple_protected.h b/src/tests/eo/access/access_simple_protected.h similarity index 100% rename from legacy/eobj/src/tests/access/simple_protected.h rename to src/tests/eo/access/access_simple_protected.h diff --git a/legacy/eobj/src/tests/composite_objects/comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c similarity index 94% rename from legacy/eobj/src/tests/composite_objects/comp.c rename to src/tests/eo/composite_objects/composite_objects_comp.c index f0e5964bfb..b15770c9da 100644 --- a/legacy/eobj/src/tests/composite_objects/comp.c +++ b/src/tests/eo/composite_objects/composite_objects_comp.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "simple.h" -#include "comp.h" +#include "composite_objects_simple.h" +#include "composite_objects_comp.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/composite_objects/comp.h b/src/tests/eo/composite_objects/composite_objects_comp.h similarity index 100% rename from legacy/eobj/src/tests/composite_objects/comp.h rename to src/tests/eo/composite_objects/composite_objects_comp.h diff --git a/legacy/eobj/src/tests/composite_objects/main.c b/src/tests/eo/composite_objects/composite_objects_main.c similarity index 94% rename from legacy/eobj/src/tests/composite_objects/main.c rename to src/tests/eo/composite_objects/composite_objects_main.c index ae5dc5d2f0..2e5d9ab005 100644 --- a/legacy/eobj/src/tests/composite_objects/main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "simple.h" -#include "comp.h" +#include "composite_objects_simple.h" +#include "composite_objects_comp.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/composite_objects/simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c similarity index 97% rename from legacy/eobj/src/tests/composite_objects/simple.c rename to src/tests/eo/composite_objects/composite_objects_simple.c index 070b837b22..5420ef895d 100644 --- a/legacy/eobj/src/tests/composite_objects/simple.c +++ b/src/tests/eo/composite_objects/composite_objects_simple.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "simple.h" +#include "composite_objects_simple.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/composite_objects/simple.h b/src/tests/eo/composite_objects/composite_objects_simple.h similarity index 100% rename from legacy/eobj/src/tests/composite_objects/simple.h rename to src/tests/eo/composite_objects/composite_objects_simple.h diff --git a/legacy/eobj/src/tests/constructors/main.c b/src/tests/eo/constructors/constructors_main.c similarity index 81% rename from legacy/eobj/src/tests/constructors/main.c rename to src/tests/eo/constructors/constructors_main.c index 21bf4b449c..c7db62d398 100644 --- a/legacy/eobj/src/tests/constructors/main.c +++ b/src/tests/eo/constructors/constructors_main.c @@ -3,14 +3,14 @@ #endif #include "Eo.h" -#include "simple.h" -#include "simple2.h" -#include "simple3.h" -#include "simple4.h" -#include "simple5.h" -#include "simple6.h" -#include "simple7.h" -#include "mixin.h" +#include "constructors_simple.h" +#include "constructors_simple2.h" +#include "constructors_simple3.h" +#include "constructors_simple4.h" +#include "constructors_simple5.h" +#include "constructors_simple6.h" +#include "constructors_simple7.h" +#include "constructors_mixin.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/constructors/mixin.c b/src/tests/eo/constructors/constructors_mixin.c similarity index 96% rename from legacy/eobj/src/tests/constructors/mixin.c rename to src/tests/eo/constructors/constructors_mixin.c index 9dc1c302a9..7e4be36e57 100644 --- a/legacy/eobj/src/tests/constructors/mixin.c +++ b/src/tests/eo/constructors/constructors_mixin.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple.h" +#include "constructors_mixin.h" +#include "constructors_simple.h" EAPI Eo_Op MIXIN_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/constructors/mixin.h b/src/tests/eo/constructors/constructors_mixin.h similarity index 100% rename from legacy/eobj/src/tests/constructors/mixin.h rename to src/tests/eo/constructors/constructors_mixin.h diff --git a/legacy/eobj/src/tests/constructors/simple.c b/src/tests/eo/constructors/constructors_simple.c similarity index 97% rename from legacy/eobj/src/tests/constructors/simple.c rename to src/tests/eo/constructors/constructors_simple.c index f56828c5b6..b598650d73 100644 --- a/legacy/eobj/src/tests/constructors/simple.c +++ b/src/tests/eo/constructors/constructors_simple.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple.h" +#include "constructors_mixin.h" +#include "constructors_simple.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/constructors/simple.h b/src/tests/eo/constructors/constructors_simple.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple.h rename to src/tests/eo/constructors/constructors_simple.h diff --git a/legacy/eobj/src/tests/constructors/simple2.c b/src/tests/eo/constructors/constructors_simple2.c similarity index 92% rename from legacy/eobj/src/tests/constructors/simple2.c rename to src/tests/eo/constructors/constructors_simple2.c index 86c1aeafda..8aa771719d 100644 --- a/legacy/eobj/src/tests/constructors/simple2.c +++ b/src/tests/eo/constructors/constructors_simple2.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple2.h" +#include "constructors_mixin.h" +#include "constructors_simple2.h" #define MY_CLASS SIMPLE2_CLASS diff --git a/legacy/eobj/src/tests/constructors/simple2.h b/src/tests/eo/constructors/constructors_simple2.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple2.h rename to src/tests/eo/constructors/constructors_simple2.h diff --git a/legacy/eobj/src/tests/constructors/simple3.c b/src/tests/eo/constructors/constructors_simple3.c similarity index 91% rename from legacy/eobj/src/tests/constructors/simple3.c rename to src/tests/eo/constructors/constructors_simple3.c index f671b4b24c..13453b76e3 100644 --- a/legacy/eobj/src/tests/constructors/simple3.c +++ b/src/tests/eo/constructors/constructors_simple3.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple3.h" +#include "constructors_mixin.h" +#include "constructors_simple3.h" #define MY_CLASS SIMPLE3_CLASS diff --git a/legacy/eobj/src/tests/constructors/simple3.h b/src/tests/eo/constructors/constructors_simple3.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple3.h rename to src/tests/eo/constructors/constructors_simple3.h diff --git a/legacy/eobj/src/tests/constructors/simple4.c b/src/tests/eo/constructors/constructors_simple4.c similarity index 79% rename from legacy/eobj/src/tests/constructors/simple4.c rename to src/tests/eo/constructors/constructors_simple4.c index 95cfa73003..abce301e3a 100644 --- a/legacy/eobj/src/tests/constructors/simple4.c +++ b/src/tests/eo/constructors/constructors_simple4.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple.h" -#include "simple4.h" +#include "constructors_mixin.h" +#include "constructors_simple.h" +#include "constructors_simple4.h" #define MY_CLASS SIMPLE4_CLASS diff --git a/legacy/eobj/src/tests/constructors/simple4.h b/src/tests/eo/constructors/constructors_simple4.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple4.h rename to src/tests/eo/constructors/constructors_simple4.h diff --git a/legacy/eobj/src/tests/constructors/simple5.c b/src/tests/eo/constructors/constructors_simple5.c similarity index 91% rename from legacy/eobj/src/tests/constructors/simple5.c rename to src/tests/eo/constructors/constructors_simple5.c index 9ff6d49468..bd2f1a5b3b 100644 --- a/legacy/eobj/src/tests/constructors/simple5.c +++ b/src/tests/eo/constructors/constructors_simple5.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple5.h" +#include "constructors_mixin.h" +#include "constructors_simple5.h" #define MY_CLASS SIMPLE5_CLASS diff --git a/legacy/eobj/src/tests/constructors/simple5.h b/src/tests/eo/constructors/constructors_simple5.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple5.h rename to src/tests/eo/constructors/constructors_simple5.h diff --git a/legacy/eobj/src/tests/constructors/simple6.c b/src/tests/eo/constructors/constructors_simple6.c similarity index 92% rename from legacy/eobj/src/tests/constructors/simple6.c rename to src/tests/eo/constructors/constructors_simple6.c index 7c224d75f2..561556d4b0 100644 --- a/legacy/eobj/src/tests/constructors/simple6.c +++ b/src/tests/eo/constructors/constructors_simple6.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple6.h" +#include "constructors_mixin.h" +#include "constructors_simple6.h" #define MY_CLASS SIMPLE6_CLASS diff --git a/legacy/eobj/src/tests/constructors/simple6.h b/src/tests/eo/constructors/constructors_simple6.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple6.h rename to src/tests/eo/constructors/constructors_simple6.h diff --git a/legacy/eobj/src/tests/constructors/simple7.c b/src/tests/eo/constructors/constructors_simple7.c similarity index 88% rename from legacy/eobj/src/tests/constructors/simple7.c rename to src/tests/eo/constructors/constructors_simple7.c index 42af6cf8c2..de197bf4f4 100644 --- a/legacy/eobj/src/tests/constructors/simple7.c +++ b/src/tests/eo/constructors/constructors_simple7.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple7.h" -#include "simple2.h" +#include "constructors_mixin.h" +#include "constructors_simple7.h" +#include "constructors_simple2.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/constructors/simple7.h b/src/tests/eo/constructors/constructors_simple7.h similarity index 100% rename from legacy/eobj/src/tests/constructors/simple7.h rename to src/tests/eo/constructors/constructors_simple7.h diff --git a/legacy/eobj/src/tests/eunit_tests.h b/src/tests/eo/eunit_tests.h similarity index 100% rename from legacy/eobj/src/tests/eunit_tests.h rename to src/tests/eo/eunit_tests.h diff --git a/legacy/eobj/src/tests/function_overrides/inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c similarity index 82% rename from legacy/eobj/src/tests/function_overrides/inherit.c rename to src/tests/eo/function_overrides/function_overrides_inherit.c index 2b3ad489c3..e2dadbec1b 100644 --- a/legacy/eobj/src/tests/function_overrides/inherit.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "simple.h" -#include "inherit.h" +#include "function_overrides_simple.h" +#include "function_overrides_inherit.h" #define MY_CLASS INHERIT_CLASS diff --git a/legacy/eobj/src/tests/function_overrides/inherit.h b/src/tests/eo/function_overrides/function_overrides_inherit.h similarity index 100% rename from legacy/eobj/src/tests/function_overrides/inherit.h rename to src/tests/eo/function_overrides/function_overrides_inherit.h diff --git a/legacy/eobj/src/tests/function_overrides/inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c similarity index 94% rename from legacy/eobj/src/tests/function_overrides/inherit2.c rename to src/tests/eo/function_overrides/function_overrides_inherit2.c index 484b6d0444..1386759bc6 100644 --- a/legacy/eobj/src/tests/function_overrides/inherit2.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "simple.h" -#include "inherit.h" -#include "inherit2.h" +#include "function_overrides_simple.h" +#include "function_overrides_inherit.h" +#include "function_overrides_inherit2.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/function_overrides/inherit2.h b/src/tests/eo/function_overrides/function_overrides_inherit2.h similarity index 100% rename from legacy/eobj/src/tests/function_overrides/inherit2.h rename to src/tests/eo/function_overrides/function_overrides_inherit2.h diff --git a/legacy/eobj/src/tests/function_overrides/inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c similarity index 87% rename from legacy/eobj/src/tests/function_overrides/inherit3.c rename to src/tests/eo/function_overrides/function_overrides_inherit3.c index 66f31fe5e5..186291328a 100644 --- a/legacy/eobj/src/tests/function_overrides/inherit3.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "simple.h" -#include "inherit2.h" -#include "inherit3.h" +#include "function_overrides_simple.h" +#include "function_overrides_inherit2.h" +#include "function_overrides_inherit3.h" #define MY_CLASS INHERIT3_CLASS diff --git a/legacy/eobj/src/tests/function_overrides/inherit3.h b/src/tests/eo/function_overrides/function_overrides_inherit3.h similarity index 100% rename from legacy/eobj/src/tests/function_overrides/inherit3.h rename to src/tests/eo/function_overrides/function_overrides_inherit3.h diff --git a/legacy/eobj/src/tests/function_overrides/main.c b/src/tests/eo/function_overrides/function_overrides_main.c similarity index 88% rename from legacy/eobj/src/tests/function_overrides/main.c rename to src/tests/eo/function_overrides/function_overrides_main.c index c45cfe5908..4ab695f982 100644 --- a/legacy/eobj/src/tests/function_overrides/main.c +++ b/src/tests/eo/function_overrides/function_overrides_main.c @@ -3,10 +3,10 @@ #endif #include "Eo.h" -#include "simple.h" -#include "inherit.h" -#include "inherit2.h" -#include "inherit3.h" +#include "function_overrides_simple.h" +#include "function_overrides_inherit.h" +#include "function_overrides_inherit2.h" +#include "function_overrides_inherit3.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/function_overrides/simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c similarity index 98% rename from legacy/eobj/src/tests/function_overrides/simple.c rename to src/tests/eo/function_overrides/function_overrides_simple.c index 378189072f..1672943939 100644 --- a/legacy/eobj/src/tests/function_overrides/simple.c +++ b/src/tests/eo/function_overrides/function_overrides_simple.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "simple.h" +#include "function_overrides_simple.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/function_overrides/simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h similarity index 100% rename from legacy/eobj/src/tests/function_overrides/simple.h rename to src/tests/eo/function_overrides/function_overrides_simple.h diff --git a/legacy/eobj/src/tests/interface/interface.c b/src/tests/eo/interface/interface_interface.c similarity index 90% rename from legacy/eobj/src/tests/interface/interface.c rename to src/tests/eo/interface/interface_interface.c index 27a986bc17..c0dec7649d 100644 --- a/legacy/eobj/src/tests/interface/interface.c +++ b/src/tests/eo/interface/interface_interface.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "interface.h" -#include "simple.h" +#include "interface_interface.h" +#include "interface_simple.h" EAPI Eo_Op INTERFACE_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/interface/interface.h b/src/tests/eo/interface/interface_interface.h similarity index 100% rename from legacy/eobj/src/tests/interface/interface.h rename to src/tests/eo/interface/interface_interface.h diff --git a/legacy/eobj/src/tests/interface/interface2.c b/src/tests/eo/interface/interface_interface2.c similarity index 86% rename from legacy/eobj/src/tests/interface/interface2.c rename to src/tests/eo/interface/interface_interface2.c index 74619dbdbd..14d3f1d0f8 100644 --- a/legacy/eobj/src/tests/interface/interface2.c +++ b/src/tests/eo/interface/interface_interface2.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "interface.h" -#include "interface2.h" -#include "simple.h" +#include "interface_interface.h" +#include "interface_interface2.h" +#include "interface_simple.h" EAPI Eo_Op INTERFACE2_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/interface/interface2.h b/src/tests/eo/interface/interface_interface2.h similarity index 100% rename from legacy/eobj/src/tests/interface/interface2.h rename to src/tests/eo/interface/interface_interface2.h diff --git a/legacy/eobj/src/tests/interface/main.c b/src/tests/eo/interface/interface_main.c similarity index 87% rename from legacy/eobj/src/tests/interface/main.c rename to src/tests/eo/interface/interface_main.c index 0abe495456..5fa65266f6 100644 --- a/legacy/eobj/src/tests/interface/main.c +++ b/src/tests/eo/interface/interface_main.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "simple.h" -#include "interface.h" -#include "interface2.h" +#include "interface_simple.h" +#include "interface_interface.h" +#include "interface_interface2.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/interface/simple.c b/src/tests/eo/interface/interface_simple.c similarity index 96% rename from legacy/eobj/src/tests/interface/simple.c rename to src/tests/eo/interface/interface_simple.c index d19ecad82f..e6f3c156b5 100644 --- a/legacy/eobj/src/tests/interface/simple.c +++ b/src/tests/eo/interface/interface_simple.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "interface.h" -#include "interface2.h" -#include "simple.h" +#include "interface_interface.h" +#include "interface_interface2.h" +#include "interface_simple.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/interface/simple.h b/src/tests/eo/interface/interface_simple.h similarity index 100% rename from legacy/eobj/src/tests/interface/simple.h rename to src/tests/eo/interface/interface_simple.h diff --git a/legacy/eobj/src/tests/mixin/inherit.c b/src/tests/eo/mixin/mixin_inherit.c similarity index 91% rename from legacy/eobj/src/tests/mixin/inherit.c rename to src/tests/eo/mixin/mixin_inherit.c index f23ec41e22..4dc8fd9e15 100644 --- a/legacy/eobj/src/tests/mixin/inherit.c +++ b/src/tests/eo/mixin/mixin_inherit.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "simple.h" -#include "mixin4.h" -#include "inherit.h" +#include "mixin_simple.h" +#include "mixin_mixin4.h" +#include "mixin_inherit.h" #define MY_CLASS INHERIT_CLASS diff --git a/src/tests/eo/mixin/mixin_inherit.h b/src/tests/eo/mixin/mixin_inherit.h new file mode 100644 index 0000000000..2f33647958 --- /dev/null +++ b/src/tests/eo/mixin/mixin_inherit.h @@ -0,0 +1,7 @@ +#ifndef INHERIT_H +#define INHERIT_H + +#define INHERIT_CLASS inherit_class_get() +const Eo_Class *inherit_class_get(void); + +#endif diff --git a/legacy/eobj/src/tests/mixin/main.c b/src/tests/eo/mixin/mixin_main.c similarity index 86% rename from legacy/eobj/src/tests/mixin/main.c rename to src/tests/eo/mixin/mixin_main.c index bd0c289617..bb19e9ca18 100644 --- a/legacy/eobj/src/tests/mixin/main.c +++ b/src/tests/eo/mixin/mixin_main.c @@ -3,11 +3,11 @@ #endif #include "Eo.h" -#include "simple.h" -#include "inherit.h" -#include "mixin.h" -#include "mixin2.h" -#include "mixin3.h" +#include "mixin_simple.h" +#include "mixin_inherit.h" +#include "mixin_mixin.h" +#include "mixin_mixin2.h" +#include "mixin_mixin3.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/mixin/mixin.c b/src/tests/eo/mixin/mixin_mixin.c similarity index 96% rename from legacy/eobj/src/tests/mixin/mixin.c rename to src/tests/eo/mixin/mixin_mixin.c index 3be53ce397..b6fd59e367 100644 --- a/legacy/eobj/src/tests/mixin/mixin.c +++ b/src/tests/eo/mixin/mixin_mixin.c @@ -3,8 +3,8 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "simple.h" +#include "mixin_mixin.h" +#include "mixin_simple.h" EAPI Eo_Op MIXIN_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/mixin/mixin.h b/src/tests/eo/mixin/mixin_mixin.h similarity index 100% rename from legacy/eobj/src/tests/mixin/mixin.h rename to src/tests/eo/mixin/mixin_mixin.h diff --git a/legacy/eobj/src/tests/mixin/mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c similarity index 95% rename from legacy/eobj/src/tests/mixin/mixin2.c rename to src/tests/eo/mixin/mixin_mixin2.c index a6eb82db53..dbd7c97d00 100644 --- a/legacy/eobj/src/tests/mixin/mixin2.c +++ b/src/tests/eo/mixin/mixin_mixin2.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "mixin2.h" -#include "simple.h" +#include "mixin_mixin.h" +#include "mixin_mixin2.h" +#include "mixin_simple.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/mixin/mixin2.h b/src/tests/eo/mixin/mixin_mixin2.h similarity index 100% rename from legacy/eobj/src/tests/mixin/mixin2.h rename to src/tests/eo/mixin/mixin_mixin2.h diff --git a/legacy/eobj/src/tests/mixin/mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c similarity index 95% rename from legacy/eobj/src/tests/mixin/mixin3.c rename to src/tests/eo/mixin/mixin_mixin3.c index 62468afef0..08c2b5cc7b 100644 --- a/legacy/eobj/src/tests/mixin/mixin3.c +++ b/src/tests/eo/mixin/mixin_mixin3.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "mixin3.h" -#include "simple.h" +#include "mixin_mixin.h" +#include "mixin_mixin3.h" +#include "mixin_simple.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/mixin/mixin3.h b/src/tests/eo/mixin/mixin_mixin3.h similarity index 100% rename from legacy/eobj/src/tests/mixin/mixin3.h rename to src/tests/eo/mixin/mixin_mixin3.h diff --git a/legacy/eobj/src/tests/mixin/mixin4.c b/src/tests/eo/mixin/mixin_mixin4.c similarity index 83% rename from legacy/eobj/src/tests/mixin/mixin4.c rename to src/tests/eo/mixin/mixin_mixin4.c index 185884156b..cf8f16f965 100644 --- a/legacy/eobj/src/tests/mixin/mixin4.c +++ b/src/tests/eo/mixin/mixin_mixin4.c @@ -3,9 +3,9 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "mixin4.h" -#include "simple.h" +#include "mixin_mixin.h" +#include "mixin_mixin4.h" +#include "mixin_simple.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/mixin/mixin4.h b/src/tests/eo/mixin/mixin_mixin4.h similarity index 100% rename from legacy/eobj/src/tests/mixin/mixin4.h rename to src/tests/eo/mixin/mixin_mixin4.h diff --git a/legacy/eobj/src/tests/mixin/simple.c b/src/tests/eo/mixin/mixin_simple.c similarity index 94% rename from legacy/eobj/src/tests/mixin/simple.c rename to src/tests/eo/mixin/mixin_simple.c index d7b95f2e85..ff4600d727 100644 --- a/legacy/eobj/src/tests/mixin/simple.c +++ b/src/tests/eo/mixin/mixin_simple.c @@ -3,10 +3,10 @@ #endif #include "Eo.h" -#include "mixin.h" -#include "mixin2.h" -#include "mixin3.h" -#include "simple.h" +#include "mixin_mixin.h" +#include "mixin_mixin2.h" +#include "mixin_mixin3.h" +#include "mixin_simple.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/src/tests/eo/mixin/mixin_simple.h b/src/tests/eo/mixin/mixin_simple.h new file mode 100644 index 0000000000..8df8131278 --- /dev/null +++ b/src/tests/eo/mixin/mixin_simple.h @@ -0,0 +1,47 @@ +#ifndef SIMPLE_H +#define SIMPLE_H + +extern EAPI Eo_Op SIMPLE_BASE_ID; + +enum { + SIMPLE_SUB_ID_A_SET, + SIMPLE_SUB_ID_A_GET, + SIMPLE_SUB_ID_B_SET, + SIMPLE_SUB_ID_B_GET, + SIMPLE_SUB_ID_LAST +}; + +#define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id) + +/** + * @def simple_a_set(a) + * @brief Set value to a-property + * @param[in] a integer value to set + */ +#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a) + +/** + * @def simple_a_get(a) + * @brief Get value of a-property + * @param[out] integer pointer to a-value + */ +#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a) + +/** + * @def simple_b_set(b) + * @brief Set value to b-property + * @param[in] a integer value to set + */ +#define simple_b_set(b) SIMPLE_ID(SIMPLE_SUB_ID_B_SET), EO_TYPECHECK(int, b) + +/** + * @def simple_b_get(b) + * @brief Get value of b-property + * @param[out] integer pointer to b-value + */ +#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b) + +#define SIMPLE_CLASS simple_class_get() +const Eo_Class *simple_class_get(void); + +#endif diff --git a/legacy/eobj/src/tests/signals/main.c b/src/tests/eo/signals/signals_main.c similarity index 99% rename from legacy/eobj/src/tests/signals/main.c rename to src/tests/eo/signals/signals_main.c index 69e25b06a1..4bf20caf62 100644 --- a/legacy/eobj/src/tests/signals/main.c +++ b/src/tests/eo/signals/signals_main.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "simple.h" +#include "signals_simple.h" #include "../eunit_tests.h" diff --git a/legacy/eobj/src/tests/signals/simple.c b/src/tests/eo/signals/signals_simple.c similarity index 98% rename from legacy/eobj/src/tests/signals/simple.c rename to src/tests/eo/signals/signals_simple.c index 168761c0b9..506d798138 100644 --- a/legacy/eobj/src/tests/signals/simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "simple.h" +#include "signals_simple.h" EAPI Eo_Op SIMPLE_BASE_ID = 0; diff --git a/legacy/eobj/src/tests/signals/simple.h b/src/tests/eo/signals/signals_simple.h similarity index 100% rename from legacy/eobj/src/tests/signals/simple.h rename to src/tests/eo/signals/signals_simple.h diff --git a/legacy/eobj/src/tests/eo_suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c similarity index 100% rename from legacy/eobj/src/tests/eo_suite/eo_suite.c rename to src/tests/eo/suite/eo_suite.c diff --git a/legacy/eobj/src/tests/eo_suite/eo_suite.h b/src/tests/eo/suite/eo_suite.h similarity index 100% rename from legacy/eobj/src/tests/eo_suite/eo_suite.h rename to src/tests/eo/suite/eo_suite.h diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c similarity index 99% rename from legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c rename to src/tests/eo/suite/eo_test_class_errors.c index 428359f9c3..77d9ef9c7a 100644 --- a/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c +++ b/src/tests/eo/suite/eo_test_class_errors.c @@ -6,7 +6,7 @@ #include "Eo.h" #include "eo_suite.h" -#include "class_simple.h" +#include "eo_test_class_simple.h" START_TEST(eo_incomplete_desc) { diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c similarity index 98% rename from legacy/eobj/src/tests/eo_suite/class_simple.c rename to src/tests/eo/suite/eo_test_class_simple.c index bf60a9f149..224f5b5a54 100644 --- a/legacy/eobj/src/tests/eo_suite/class_simple.c +++ b/src/tests/eo/suite/eo_test_class_simple.c @@ -3,7 +3,7 @@ #endif #include "Eo.h" -#include "class_simple.h" +#include "eo_test_class_simple.h" #define MY_CLASS SIMPLE_CLASS diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h similarity index 100% rename from legacy/eobj/src/tests/eo_suite/class_simple.h rename to src/tests/eo/suite/eo_test_class_simple.h diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c similarity index 99% rename from legacy/eobj/src/tests/eo_suite/eo_test_general.c rename to src/tests/eo/suite/eo_test_general.c index 0ab8153999..0952613888 100644 --- a/legacy/eobj/src/tests/eo_suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -6,7 +6,7 @@ #include "Eo.h" #include "eo_suite.h" -#include "class_simple.h" +#include "eo_test_class_simple.h" START_TEST(eo_simple) { diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c similarity index 100% rename from legacy/eobj/src/tests/eo_suite/eo_test_init.c rename to src/tests/eo/suite/eo_test_init.c