summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-26 06:56:52 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-26 06:56:52 +0000
commit3b5a3448b7dfc53c2f129bdb04bea9f7a02741a6 (patch)
tree18ad8a6b1841e9832c85a46f887b2cd6d6dacc4b
parent195d31c73fef88cfaa803b07b2ae3cba983a4093 (diff)
merge: add eo
SVN revision: 77072
-rw-r--r--Makefile.am21
-rw-r--r--configure.ac77
-rw-r--r--eo.pc.in (renamed from legacy/eobj/eo.pc.in)0
-rw-r--r--src/benchmarks/Makefile.am5
-rw-r--r--src/benchmarks/eo/Makefile.am29
-rw-r--r--src/benchmarks/eo/class_simple.c (renamed from legacy/eobj/src/benchmarks/class_simple.c)0
-rw-r--r--src/benchmarks/eo/class_simple.h (renamed from legacy/eobj/src/benchmarks/class_simple.h)0
-rw-r--r--src/benchmarks/eo/eo_bench.c (renamed from legacy/eobj/src/benchmarks/eo_bench.c)0
-rw-r--r--src/benchmarks/eo/eo_bench.h (renamed from legacy/eobj/src/benchmarks/eo_bench.h)0
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c (renamed from legacy/eobj/src/benchmarks/eo_bench_eo_do.c)0
-rw-r--r--src/examples/Makefile.am8
-rw-r--r--src/examples/eo/Makefile.am83
-rw-r--r--src/examples/eo/evas/evas_elw_box.c (renamed from legacy/eobj/src/examples/evas/elw_box.c)0
-rw-r--r--src/examples/eo/evas/evas_elw_box.h (renamed from legacy/eobj/src/examples/evas/elw_box.h)0
-rw-r--r--src/examples/eo/evas/evas_elw_boxedbutton.c (renamed from legacy/eobj/src/examples/evas/elw_boxedbutton.c)0
-rw-r--r--src/examples/eo/evas/evas_elw_boxedbutton.h (renamed from legacy/eobj/src/examples/evas/elw_boxedbutton.h)0
-rw-r--r--src/examples/eo/evas/evas_elw_button.c (renamed from legacy/eobj/src/examples/evas/elw_button.c)0
-rw-r--r--src/examples/eo/evas/evas_elw_button.h (renamed from legacy/eobj/src/examples/evas/elw_button.h)0
-rw-r--r--src/examples/eo/evas/evas_elw_win.c (renamed from legacy/eobj/src/examples/evas/elw_win.c)0
-rw-r--r--src/examples/eo/evas/evas_elw_win.h (renamed from legacy/eobj/src/examples/evas/elw_win.h)0
-rw-r--r--src/examples/eo/evas/evas_evas_obj.c (renamed from legacy/eobj/src/examples/evas/evas_obj.c)0
-rw-r--r--src/examples/eo/evas/evas_evas_obj.h (renamed from legacy/eobj/src/examples/evas/evas_obj.h)0
-rw-r--r--src/examples/eo/evas/evas_test.c (renamed from legacy/eobj/src/examples/evas/test.c)0
-rw-r--r--src/examples/eo/isa/eo_isa_complex.c (renamed from legacy/eobj/src/examples/eo_isa/complex.c)2
-rw-r--r--src/examples/eo/isa/eo_isa_complex.h (renamed from legacy/eobj/src/examples/eo_isa/complex.h)2
-rw-r--r--src/examples/eo/isa/eo_isa_interface.c (renamed from legacy/eobj/src/examples/simple/interface.c)2
-rw-r--r--src/examples/eo/isa/eo_isa_interface.h (renamed from legacy/eobj/src/examples/eo_isa/interface.h)0
-rw-r--r--src/examples/eo/isa/eo_isa_main.c (renamed from legacy/eobj/src/examples/eo_isa/main.c)4
-rw-r--r--src/examples/eo/isa/eo_isa_mixin.c (renamed from legacy/eobj/src/examples/eo_isa/mixin.c)4
-rw-r--r--src/examples/eo/isa/eo_isa_mixin.h (renamed from legacy/eobj/src/examples/eo_isa/mixin.h)0
-rw-r--r--src/examples/eo/isa/eo_isa_simple.c (renamed from legacy/eobj/src/examples/eo_isa/simple.c)2
-rw-r--r--src/examples/eo/isa/eo_isa_simple.h (renamed from legacy/eobj/src/examples/simple/simple.h)4
-rw-r--r--src/examples/eo/simple/simple_interface.c29
-rw-r--r--src/examples/eo/simple/simple_interface.h26
-rw-r--r--src/examples/eo/simple/simple_main.c (renamed from legacy/eobj/src/examples/simple/main.c)2
-rw-r--r--src/examples/eo/simple/simple_mixin.c53
-rw-r--r--src/examples/eo/simple/simple_mixin.h26
-rw-r--r--src/examples/eo/simple/simple_simple.c78
-rw-r--r--src/examples/eo/simple/simple_simple.h35
-rw-r--r--src/lib/Makefile.am6
-rw-r--r--src/lib/eo/Eo.h (renamed from legacy/eobj/src/lib/Eo.h)0
-rw-r--r--src/lib/eo/Makefile.am21
-rw-r--r--src/lib/eo/eo.c (renamed from legacy/eobj/src/lib/eo.c)0
-rw-r--r--src/lib/eo/eo_base_class.c (renamed from legacy/eobj/src/lib/eo_base_class.c)0
-rw-r--r--src/lib/eo/eo_private.h (renamed from legacy/eobj/src/lib/eo_private.h)0
-rw-r--r--src/tests/Makefile.am6
-rw-r--r--src/tests/eo/Makefile.am126
-rw-r--r--src/tests/eo/access/access_inherit.c (renamed from legacy/eobj/src/tests/access/inherit.c)7
-rw-r--r--src/tests/eo/access/access_inherit.h (renamed from legacy/eobj/src/tests/access/inherit.h)0
-rw-r--r--src/tests/eo/access/access_main.c (renamed from legacy/eobj/src/tests/access/main.c)4
-rw-r--r--src/tests/eo/access/access_simple.c (renamed from legacy/eobj/src/tests/access/simple.c)4
-rw-r--r--src/tests/eo/access/access_simple.h (renamed from legacy/eobj/src/tests/access/simple.h)0
-rw-r--r--src/tests/eo/access/access_simple_protected.h (renamed from legacy/eobj/src/tests/access/simple_protected.h)0
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c (renamed from legacy/eobj/src/tests/composite_objects/comp.c)4
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.h (renamed from legacy/eobj/src/tests/composite_objects/comp.h)0
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c (renamed from legacy/eobj/src/tests/composite_objects/main.c)4
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c (renamed from legacy/eobj/src/tests/composite_objects/simple.c)2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.h (renamed from legacy/eobj/src/tests/composite_objects/simple.h)0
-rw-r--r--src/tests/eo/constructors/constructors_main.c (renamed from legacy/eobj/src/tests/constructors/main.c)16
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c (renamed from legacy/eobj/src/tests/constructors/mixin.c)4
-rw-r--r--src/tests/eo/constructors/constructors_mixin.h (renamed from legacy/eobj/src/tests/constructors/mixin.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple.c (renamed from legacy/eobj/src/tests/constructors/simple.c)4
-rw-r--r--src/tests/eo/constructors/constructors_simple.h (renamed from legacy/eobj/src/tests/constructors/simple.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c (renamed from legacy/eobj/src/tests/constructors/simple2.c)4
-rw-r--r--src/tests/eo/constructors/constructors_simple2.h (renamed from legacy/eobj/src/tests/constructors/simple2.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c (renamed from legacy/eobj/src/tests/constructors/simple3.c)4
-rw-r--r--src/tests/eo/constructors/constructors_simple3.h (renamed from legacy/eobj/src/tests/constructors/simple3.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple4.c (renamed from legacy/eobj/src/tests/constructors/simple4.c)6
-rw-r--r--src/tests/eo/constructors/constructors_simple4.h (renamed from legacy/eobj/src/tests/constructors/simple4.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c (renamed from legacy/eobj/src/tests/constructors/simple5.c)4
-rw-r--r--src/tests/eo/constructors/constructors_simple5.h (renamed from legacy/eobj/src/tests/constructors/simple5.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c (renamed from legacy/eobj/src/tests/constructors/simple6.c)4
-rw-r--r--src/tests/eo/constructors/constructors_simple6.h (renamed from legacy/eobj/src/tests/constructors/simple6.h)0
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c (renamed from legacy/eobj/src/tests/constructors/simple7.c)6
-rw-r--r--src/tests/eo/constructors/constructors_simple7.h (renamed from legacy/eobj/src/tests/constructors/simple7.h)0
-rw-r--r--src/tests/eo/eunit_tests.h (renamed from legacy/eobj/src/tests/eunit_tests.h)0
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.c (renamed from legacy/eobj/src/tests/function_overrides/inherit.c)4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.h (renamed from legacy/eobj/src/tests/function_overrides/inherit.h)0
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c (renamed from legacy/eobj/src/tests/function_overrides/inherit2.c)6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.h (renamed from legacy/eobj/src/tests/function_overrides/inherit2.h)0
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c (renamed from legacy/eobj/src/tests/function_overrides/inherit3.c)6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.h (renamed from legacy/eobj/src/tests/function_overrides/inherit3.h)0
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c (renamed from legacy/eobj/src/tests/function_overrides/main.c)8
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c (renamed from legacy/eobj/src/tests/function_overrides/simple.c)2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.h (renamed from legacy/eobj/src/tests/function_overrides/simple.h)0
-rw-r--r--src/tests/eo/interface/interface_interface.c (renamed from legacy/eobj/src/tests/interface/interface.c)4
-rw-r--r--src/tests/eo/interface/interface_interface.h (renamed from legacy/eobj/src/tests/interface/interface.h)0
-rw-r--r--src/tests/eo/interface/interface_interface2.c (renamed from legacy/eobj/src/tests/interface/interface2.c)6
-rw-r--r--src/tests/eo/interface/interface_interface2.h (renamed from legacy/eobj/src/tests/interface/interface2.h)0
-rw-r--r--src/tests/eo/interface/interface_main.c (renamed from legacy/eobj/src/tests/interface/main.c)6
-rw-r--r--src/tests/eo/interface/interface_simple.c (renamed from legacy/eobj/src/tests/interface/simple.c)6
-rw-r--r--src/tests/eo/interface/interface_simple.h (renamed from legacy/eobj/src/tests/interface/simple.h)0
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c (renamed from legacy/eobj/src/tests/mixin/inherit.c)6
-rw-r--r--src/tests/eo/mixin/mixin_inherit.h7
-rw-r--r--src/tests/eo/mixin/mixin_main.c (renamed from legacy/eobj/src/tests/mixin/main.c)10
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c (renamed from legacy/eobj/src/tests/mixin/mixin.c)4
-rw-r--r--src/tests/eo/mixin/mixin_mixin.h (renamed from legacy/eobj/src/tests/mixin/mixin.h)0
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c (renamed from legacy/eobj/src/tests/mixin/mixin2.c)6
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.h (renamed from legacy/eobj/src/tests/mixin/mixin2.h)0
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c (renamed from legacy/eobj/src/tests/mixin/mixin3.c)6
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.h (renamed from legacy/eobj/src/tests/mixin/mixin3.h)0
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.c (renamed from legacy/eobj/src/tests/mixin/mixin4.c)6
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.h (renamed from legacy/eobj/src/tests/mixin/mixin4.h)0
-rw-r--r--src/tests/eo/mixin/mixin_simple.c (renamed from legacy/eobj/src/tests/mixin/simple.c)8
-rw-r--r--src/tests/eo/mixin/mixin_simple.h47
-rw-r--r--src/tests/eo/signals/signals_main.c (renamed from legacy/eobj/src/tests/signals/main.c)2
-rw-r--r--src/tests/eo/signals/signals_simple.c (renamed from legacy/eobj/src/tests/signals/simple.c)2
-rw-r--r--src/tests/eo/signals/signals_simple.h (renamed from legacy/eobj/src/tests/signals/simple.h)0
-rw-r--r--src/tests/eo/suite/eo_suite.c (renamed from legacy/eobj/src/tests/eo_suite/eo_suite.c)0
-rw-r--r--src/tests/eo/suite/eo_suite.h (renamed from legacy/eobj/src/tests/eo_suite/eo_suite.h)0
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c (renamed from legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c)2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c (renamed from legacy/eobj/src/tests/eo_suite/class_simple.c)2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.h (renamed from legacy/eobj/src/tests/eo_suite/class_simple.h)0
-rw-r--r--src/tests/eo/suite/eo_test_general.c (renamed from legacy/eobj/src/tests/eo_suite/eo_test_general.c)2
-rw-r--r--src/tests/eo/suite/eo_test_init.c (renamed from legacy/eobj/src/tests/eo_suite/eo_test_init.c)0
115 files changed, 772 insertions, 114 deletions
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 \
31m4/evil_windows.m4 \ 31m4/evil_windows.m4 \
32m4/eina_check.m4 32m4/eina_check.m4
33 33
34if HAVE_WINDOWS
35EXTRA_DIST += \ 34EXTRA_DIST += \
36ChangeLog.evil \ 35ChangeLog.evil \
37NEWS.evil \ 36NEWS.evil \
38README.evil \ 37README.evil \
39evil.pc 38evil.pc \
40endif
41
42EXTRA_DIST += \
43ChangeLog.eina \ 39ChangeLog.eina \
44NEWS.eina \ 40NEWS.eina \
45README.eina \ 41README.eina \
@@ -49,7 +45,8 @@ ChangeLog.eet \
49NEWS.eet \ 45NEWS.eet \
50README.eet \ 46README.eet \
51eet.spec \ 47eet.spec \
52eet.pc 48eet.pc \
49eo.pc
53 50
54pkgconfigdir = $(libdir)/pkgconfig 51pkgconfigdir = $(libdir)/pkgconfig
55pkgconfig_DATA = 52pkgconfig_DATA =
@@ -64,6 +61,10 @@ if EFL_BUILD_EET
64pkgconfig_DATA += eet.pc 61pkgconfig_DATA += eet.pc
65endif 62endif
66 63
64if EFL_BUILD_EO
65pkgconfig_DATA += eo.pc
66endif
67
67 68
68.PHONY: doc benchmark examples install-examples 69.PHONY: doc benchmark examples install-examples
69 70
@@ -97,10 +98,12 @@ check-local:
97if EFL_ENABLE_COVERAGE 98if EFL_ENABLE_COVERAGE
98 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 99 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
99endif 100endif
100 @./src/tests/eina/eina_suite$(EXEEXT)
101if EFL_BUILD_EET 101if EFL_BUILD_EET
102 @./src/tests/eet/eet_suite$(EXEEXT) 102 @./src/tests/eet/eet_suite$(EXEEXT)
103endif 103endif
104if EFL_BUILD_EO
105 @./src/tests/eo/eo_suite$(EXEEXT)
106endif
104if EFL_ENABLE_COVERAGE 107if EFL_ENABLE_COVERAGE
105 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 108 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
106endif 109endif
@@ -112,7 +115,9 @@ endif
112benchmark: 115benchmark:
113 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark 116 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark
114 @mkdir benchmark || true 117 @mkdir benchmark || true
115 @cd benchmark && ../src/benchmarks/eina/eina_bench$(EXEEXT) `date +%F_%s` 118if EFL_BUILD_EO
119 @cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
120endif
116 121
117benchmark-e17: 122benchmark-e17:
118 @$(MAKE) $(AM_MAKEFLAGS) -C src benchmark-e17 123 @$(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])
51 51
52#### Default values 52#### Default values
53 53
54want_eina="yes"
55want_eet="yes"
56want_evas="yes" 54want_evas="yes"
57want_ecore="yes" 55want_ecore="yes"
58want_embryo="yes" 56want_embryo="yes"
@@ -97,6 +95,7 @@ requirements_libs_deps_elementary=""
97 95
98requirements_pc_eina="" 96requirements_pc_eina=""
99requirements_pc_eet="" 97requirements_pc_eet=""
98requirements_pc_eo=""
100requirements_pc_evas="" 99requirements_pc_evas=""
101requirements_pc_ecore="" 100requirements_pc_ecore=""
102requirements_pc_embryo="" 101requirements_pc_embryo=""
@@ -140,6 +139,7 @@ AC_SUBST([requirements_libs_elementary])
140 139
141AC_SUBST([requirements_pc_eina]) 140AC_SUBST([requirements_pc_eina])
142AC_SUBST([requirements_pc_eet]) 141AC_SUBST([requirements_pc_eet])
142AC_SUBST([requirements_pc_eo])
143AC_SUBST([requirements_pc_evas]) 143AC_SUBST([requirements_pc_evas])
144AC_SUBST([requirements_pc_ecore]) 144AC_SUBST([requirements_pc_ecore])
145AC_SUBST([requirements_pc_embryo]) 145AC_SUBST([requirements_pc_embryo])
@@ -197,6 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
197#### Additional options to configure 197#### Additional options to configure
198 198
199EFL_ENABLE_LIB([eet], [yes]) 199EFL_ENABLE_LIB([eet], [yes])
200EFL_ENABLE_LIB([eo], [yes])
200 201
201 202
202# Assert or fail. 203# Assert or fail.
@@ -1141,6 +1142,62 @@ fi
1141#### End of Eet 1142#### End of Eet
1142 1143
1143 1144
1145#### Eo
1146
1147efl_have_eo="no"
1148
1149if test "x${efl_want_build_eo}" = "xyes" ; then
1150
1151AC_MSG_NOTICE([Eo checks])
1152
1153### Default values
1154
1155### Additional options to configure
1156
1157### Checks for programs
1158
1159### Checks for libraries
1160
1161# Eina library
1162
1163requirements_pc_eo="eina >= 1.7.99"
1164
1165PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
1166
1167# Example (evas one)
1168
1169PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
1170AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
1171
1172### Checks for header files
1173
1174### Checks for types
1175
1176### Checks for structures
1177
1178### Checks for compiler characteristics
1179
1180EFL_EO_BUILD=""
1181case "$host_os" in
1182 mingw*)
1183 EFL_EO_BUILD="-DEFL_EO_BUILD"
1184 ;;
1185esac
1186AC_SUBST([EFL_EO_BUILD])
1187
1188### Checks for linker characteristics
1189
1190### Checks for library functions
1191
1192### Check availability
1193
1194efl_have_eo="yes"
1195
1196fi
1197
1198#### End of Eo
1199
1200
1144#### Evas 1201#### Evas
1145 1202
1146#AC_MSG_NOTICE([Evas checks]) 1203#AC_MSG_NOTICE([Evas checks])
@@ -1166,12 +1223,14 @@ doc/Doxyfile
1166src/Makefile 1223src/Makefile
1167src/benchmarks/Makefile 1224src/benchmarks/Makefile
1168src/benchmarks/eina/Makefile 1225src/benchmarks/eina/Makefile
1226src/benchmarks/eo/Makefile
1169src/bin/Makefile 1227src/bin/Makefile
1170src/bin/evil/Makefile 1228src/bin/evil/Makefile
1171src/bin/eet/Makefile 1229src/bin/eet/Makefile
1172src/examples/Makefile 1230src/examples/Makefile
1173src/examples/eina/Makefile 1231src/examples/eina/Makefile
1174src/examples/eet/Makefile 1232src/examples/eet/Makefile
1233src/examples/eo/Makefile
1175src/include/Makefile 1234src/include/Makefile
1176src/include/eina/Makefile 1235src/include/eina/Makefile
1177src/include/eina/eina_config.h 1236src/include/eina/eina_config.h
@@ -1179,6 +1238,7 @@ src/lib/Makefile
1179src/lib/evil/Makefile 1238src/lib/evil/Makefile
1180src/lib/eina/Makefile 1239src/lib/eina/Makefile
1181src/lib/eet/Makefile 1240src/lib/eet/Makefile
1241src/lib/eo/Makefile
1182src/modules/Makefile 1242src/modules/Makefile
1183src/modules/eina/Makefile 1243src/modules/eina/Makefile
1184src/modules/eina/mp/Makefile 1244src/modules/eina/mp/Makefile
@@ -1194,11 +1254,13 @@ src/scripts/eina/Makefile
1194src/tests/Makefile 1254src/tests/Makefile
1195src/tests/eina/Makefile 1255src/tests/eina/Makefile
1196src/tests/eet/Makefile 1256src/tests/eet/Makefile
1257src/tests/eo/Makefile
1197eina.spec 1258eina.spec
1198eet.spec 1259eet.spec
1199evil.pc 1260evil.pc
1200eina.pc 1261eina.pc
1201eet.pc 1262eet.pc
1263eo.pc
1202]) 1264])
1203 1265
1204AC_OUTPUT 1266AC_OUTPUT
@@ -1263,6 +1325,7 @@ echo " Pass through.......: ${enable_pass_through}"
1263echo 1325echo
1264if test "x${efl_have_eet}" = "xno" ; then 1326if test "x${efl_have_eet}" = "xno" ; then
1265echo "Eet....................: no" 1327echo "Eet....................: no"
1328echo
1266else 1329else
1267echo "Eet" 1330echo "Eet"
1268echo 1331echo
@@ -1278,6 +1341,16 @@ echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
1278echo " Examples.............: make examples" 1341echo " Examples.............: make examples"
1279echo " installation.......: make install-examples" 1342echo " installation.......: make install-examples"
1280fi 1343fi
1344if test "x${efl_have_eo}" = "xno" ; then
1345echo "Eo.....................: no"
1346echo
1347else
1348echo "Eo"
1349echo
1350echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
1351echo " Examples.............: make examples"
1352echo " installation.......: make install-examples"
1353fi
1281echo 1354echo
1282echo "Compilation............: make (or gmake)" 1355echo "Compilation............: make (or gmake)"
1283echo " CPPFLAGS.............: $CPPFLAGS" 1356echo " CPPFLAGS.............: $CPPFLAGS"
diff --git a/legacy/eobj/eo.pc.in b/eo.pc.in
index 9abb5260c3..9abb5260c3 100644
--- a/legacy/eobj/eo.pc.in
+++ b/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 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina 3SUBDIRS = eina eo
4 4
5.PHONY: benchmark benchmark-e17 5.PHONY: benchmark benchmark-e17
6 6
7benchmark: 7benchmark:
8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark 8 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark
9if EFL_BUILD_EO
10 @$(MAKE) $(AM_MAKEFLAGS) -C eo benchmark
11endif
9 12
10benchmark-e17: 13benchmark-e17:
11 @$(MAKE) $(AM_MAKEFLAGS) -C eina benchmark-e17 14 @$(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 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/include/eina \
6-I$(top_srcdir)/src/lib/eo \
7-I$(top_builddir)/src/include/eina \
8-I$(top_builddir)/src/lib/eo \
9@EFL_EO_BUILD@ \
10@EO_CFLAGS@
11
12EXTRA_PROGRAMS = eo_bench
13
14benchmark: eo_bench
15
16eo_bench_SOURCES = \
17class_simple.c \
18class_simple.h \
19eo_bench.c \
20eo_bench.h \
21eo_bench_eo_do.c
22
23eo_bench_LDADD = \
24$(top_builddir)/src/lib/eo/libeo.la \
25$(top_builddir)/src/lib/eina/libeina.la \
26@EO_LIBS@
27
28clean-local:
29 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
diff --git a/legacy/eobj/src/benchmarks/class_simple.c b/src/benchmarks/eo/class_simple.c
index 2e8dc3f621..2e8dc3f621 100644
--- a/legacy/eobj/src/benchmarks/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
diff --git a/legacy/eobj/src/benchmarks/class_simple.h b/src/benchmarks/eo/class_simple.h
index b29e7987c1..b29e7987c1 100644
--- a/legacy/eobj/src/benchmarks/class_simple.h
+++ b/src/benchmarks/eo/class_simple.h
diff --git a/legacy/eobj/src/benchmarks/eo_bench.c b/src/benchmarks/eo/eo_bench.c
index 0da83a1f34..0da83a1f34 100644
--- a/legacy/eobj/src/benchmarks/eo_bench.c
+++ b/src/benchmarks/eo/eo_bench.c
diff --git a/legacy/eobj/src/benchmarks/eo_bench.h b/src/benchmarks/eo/eo_bench.h
index feea3bc333..feea3bc333 100644
--- a/legacy/eobj/src/benchmarks/eo_bench.h
+++ b/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
index 1e8d484979..1e8d484979 100644
--- a/legacy/eobj/src/benchmarks/eo_bench_eo_do.c
+++ b/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 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = eina eet 3SUBDIRS = eina eet eo
4 4
5examples: 5examples:
6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples 6 @$(MAKE) $(AM_MAKEFLAGS) -C eina examples
7if EFL_BUILD_EET 7if EFL_BUILD_EET
8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples 8 @$(MAKE) $(AM_MAKEFLAGS) -C eet examples
9endif 9endif
10if EFL_BUILD_EO
11 @$(MAKE) $(AM_MAKEFLAGS) -C eo examples
12endif
10 13
11install-examples: 14install-examples:
12 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples 15 @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
13if EFL_BUILD_EET 16if EFL_BUILD_EET
14 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples 17 @$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
15endif 18endif
19if EFL_BUILD_EO
20 @$(MAKE) $(AM_MAKEFLAGS) -C eo install-examples
21endif
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 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I. \
5-I$(top_srcdir)/src/lib/eo \
6-I$(top_builddir)/src/lib/eo \
7@EFL_EO_BUILD@ \
8@EO_CFLAGS@
9
10EXTRA_PROGRAMS = eo_isa eo_simple
11
12if EO_BUILD_EXAMPLE_EVAS
13
14EXTRA_PROGRAMS += eo_evas
15
16endif
17
18eo_isa_SOURCES = \
19isa/eo_isa_complex.c \
20isa/eo_isa_complex.h \
21isa/eo_isa_interface.c \
22isa/eo_isa_interface.h \
23isa/eo_isa_main.c \
24isa/eo_isa_mixin.c \
25isa/eo_isa_mixin.h \
26isa/eo_isa_simple.c \
27isa/eo_isa_simple.h
28
29eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
30
31if EO_BUILD_EXAMPLE_EVAS
32
33eo_evas_SOURCES = \
34evas/evas_elw_box.c \
35evas/evas_elw_box.h \
36evas/evas_elw_boxedbutton.c \
37evas/evas_elw_boxedbutton.h \
38evas/evas_elw_button.c \
39evas/evas_elw_button.h \
40evas/evas_elw_win.h \
41evas/evas_elw_win.c \
42evas/evas_evas_obj.c \
43evas/evas_evas_obj.h \
44evas/evas_test.c
45
46eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LIBS@
47
48endif
49
50eo_simple_SOURCES = \
51simple/simple_interface.c \
52simple/simple_interface.h \
53simple/simple_main.c \
54simple/simple_mixin.c \
55simple/simple_mixin.h \
56simple/simple_simple.c \
57simple/simple_simple.h
58
59eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
60
61examples: $(EXTRA_PROGRAMS)
62
63clean-local:
64 rm -f $(EXTRA_PROGRAMS)
65
66install-examples:
67 mkdir -p $(pkgdatadir)/examples/eo/isa
68 $(install_sh_DATA) -c $(eo_isa_SOURCES) $(pkgdatadir)/examples/eo/isa
69 mkdir -p $(pkgdatadir)/examples/eo/evas
70 $(install_sh_DATA) -c $(evas_SOURCES) $(pkgdatadir)/examples/eo/evas
71 mkdir -p $(pkgdatadir)/examples/eo/simple
72 $(install_sh_DATA) -c $(simple_SOURCES) $(pkgdatadir)/examples/eo/simple
73
74uninstall-local:
75 for f in $(eo_isa_SOURCES) ; do \
76 rm -f $(pkgdatadir)/examples/eo/isa/$$f ; \
77 done
78 for f in $(evas_SOURCES) ; do \
79 rm -f $(pkgdatadir)/examples/eo/evas/$$f ; \
80 done
81 for f in $(simple_SOURCES) ; do \
82 rm -f $(pkgdatadir)/examples/eo/simple/$$f ; \
83 done
diff --git a/legacy/eobj/src/examples/evas/elw_box.c b/src/examples/eo/evas/evas_elw_box.c
index 1a2330f845..1a2330f845 100644
--- a/legacy/eobj/src/examples/evas/elw_box.c
+++ b/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
index c25382cf34..c25382cf34 100644
--- a/legacy/eobj/src/examples/evas/elw_box.h
+++ b/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
index 457dba892a..457dba892a 100644
--- a/legacy/eobj/src/examples/evas/elw_boxedbutton.c
+++ b/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
index e4ecfd2f83..e4ecfd2f83 100644
--- a/legacy/eobj/src/examples/evas/elw_boxedbutton.h
+++ b/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
index 82fa39b354..82fa39b354 100644
--- a/legacy/eobj/src/examples/evas/elw_button.c
+++ b/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
index 8cecb8104e..8cecb8104e 100644
--- a/legacy/eobj/src/examples/evas/elw_button.h
+++ b/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
index dd9e1002f5..dd9e1002f5 100644
--- a/legacy/eobj/src/examples/evas/elw_win.c
+++ b/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
index babb28b11a..babb28b11a 100644
--- a/legacy/eobj/src/examples/evas/elw_win.h
+++ b/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
index 9d13c66813..9d13c66813 100644
--- a/legacy/eobj/src/examples/evas/evas_obj.c
+++ b/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
index 7aa761c648..7aa761c648 100644
--- a/legacy/eobj/src/examples/evas/evas_obj.h
+++ b/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
index 7a5751367b..7a5751367b 100644
--- a/legacy/eobj/src/examples/evas/test.c
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "complex.h" 6#include "eo_isa_complex.h"
7 7
8#define MY_CLASS COMPLEX_CLASS 8#define MY_CLASS COMPLEX_CLASS
9 9
diff --git a/legacy/eobj/src/examples/eo_isa/complex.h b/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 @@
2#define COMPLEX_H 2#define COMPLEX_H
3 3
4#include "Eo.h" 4#include "Eo.h"
5#include "simple.h" 5#include "eo_isa_simple.h"
6 6
7#define COMPLEX_CLASS complex_class_get() 7#define COMPLEX_CLASS complex_class_get()
8const Eo_Class *complex_class_get(void); 8const 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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "interface.h" 6#include "eo_isa_interface.h"
7 7
8EAPI Eo_Op INTERFACE_BASE_ID = 0; 8EAPI Eo_Op INTERFACE_BASE_ID = 0;
9 9
diff --git a/legacy/eobj/src/examples/eo_isa/interface.h b/src/examples/eo/isa/eo_isa_interface.h
index c5bf43e135..c5bf43e135 100644
--- a/legacy/eobj/src/examples/eo_isa/interface.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "eo_isa_simple.h"
7#include "complex.h" 7#include "eo_isa_complex.h"
8 8
9int 9int
10main(int argc, char *argv[]) 10main(int argc, char *argv[])
diff --git a/legacy/eobj/src/examples/eo_isa/mixin.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "eo_isa_mixin.h"
7#include "simple.h" 7#include "eo_isa_simple.h"
8 8
9EAPI Eo_Op MIXIN_BASE_ID = 0; 9EAPI Eo_Op MIXIN_BASE_ID = 0;
10 10
diff --git a/legacy/eobj/src/examples/eo_isa/mixin.h b/src/examples/eo/isa/eo_isa_mixin.h
index 539504d3ad..539504d3ad 100644
--- a/legacy/eobj/src/examples/eo_isa/mixin.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "eo_isa_simple.h"
7 7
8EAPI Eo_Op SIMPLE_BASE_ID = 0; 8EAPI Eo_Op SIMPLE_BASE_ID = 0;
9 9
diff --git a/legacy/eobj/src/examples/simple/simple.h b/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 @@
2#define SIMPLE_H 2#define SIMPLE_H
3 3
4#include "Eo.h" 4#include "Eo.h"
5#include "interface.h" 5#include "eo_isa_interface.h"
6#include "mixin.h" 6#include "eo_isa_mixin.h"
7 7
8extern EAPI Eo_Op SIMPLE_BASE_ID; 8extern EAPI Eo_Op SIMPLE_BASE_ID;
9 9
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 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Eo.h"
6#include "simple_interface.h"
7
8EAPI Eo_Op INTERFACE_BASE_ID = 0;
9
10#define MY_CLASS INTERFACE_CLASS
11
12static const Eo_Op_Description op_desc[] = {
13 EO_OP_DESCRIPTION(INTERFACE_SUB_ID_A_POWER_3_GET, "Get the a^3"),
14 EO_OP_DESCRIPTION_SENTINEL
15};
16
17static const Eo_Class_Description class_desc = {
18 EO_VERSION,
19 "Interface",
20 EO_CLASS_TYPE_INTERFACE,
21 EO_CLASS_DESCRIPTION_OPS(&INTERFACE_BASE_ID, op_desc, INTERFACE_SUB_ID_LAST),
22 NULL,
23 0,
24 NULL,
25 NULL
26};
27
28EO_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL)
29
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 @@
1#ifndef INTERFACE_H
2#define INTERFACE_H
3
4#include "Eo.h"
5
6extern EAPI Eo_Op INTERFACE_BASE_ID;
7
8enum {
9 INTERFACE_SUB_ID_A_POWER_3_GET,
10 INTERFACE_SUB_ID_LAST
11};
12
13#define INTERFACE_ID(sub_id) (INTERFACE_BASE_ID + sub_id)
14
15
16/**
17 * @def interface_a_power_3_get(ret)
18 * @brief Get a^3
19 * @param[out] ret integer pointer to ret - value
20 */
21#define interface_a_power_3_get(ret) INTERFACE_ID(INTERFACE_SUB_ID_A_POWER_3_GET), EO_TYPECHECK(int *, ret)
22
23#define INTERFACE_CLASS interface_class_get()
24const Eo_Class *interface_class_get(void);
25
26#endif
diff --git a/legacy/eobj/src/examples/simple/main.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "simple_simple.h"
7 7
8int 8int
9main(int argc, char *argv[]) 9main(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 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Eo.h"
6#include "simple_mixin.h"
7#include "simple_simple.h"
8
9EAPI Eo_Op MIXIN_BASE_ID = 0;
10
11#define MY_CLASS MIXIN_CLASS
12
13static void
14_a_square_get(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
15{
16 int a;
17 eo_do(obj, simple_a_get(&a));
18 int *ret = va_arg(*list, int *);
19 if (ret)
20 *ret = a * a;
21 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
22}
23
24static void
25_class_constructor(Eo_Class *klass)
26{
27 const Eo_Op_Func_Description func_desc[] = {
28 EO_OP_FUNC(MIXIN_ID(MIXIN_SUB_ID_A_SQUARE_GET), _a_square_get),
29 EO_OP_FUNC_SENTINEL
30 };
31
32 eo_class_funcs_set(klass, func_desc);
33}
34
35
36static const Eo_Op_Description op_desc[] = {
37 EO_OP_DESCRIPTION(MIXIN_SUB_ID_A_SQUARE_GET, "Get the value of A^2"),
38 EO_OP_DESCRIPTION_SENTINEL
39};
40
41static const Eo_Class_Description class_desc = {
42 EO_VERSION,
43 "Mixin",
44 EO_CLASS_TYPE_MIXIN,
45 EO_CLASS_DESCRIPTION_OPS(&MIXIN_BASE_ID, op_desc, MIXIN_SUB_ID_LAST),
46 NULL,
47 0,
48 _class_constructor,
49 NULL
50};
51
52EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, NULL)
53
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 @@
1#ifndef MIXIN_H
2#define MIXIN_H
3
4#include "Eo.h"
5
6extern EAPI Eo_Op MIXIN_BASE_ID;
7
8enum {
9 MIXIN_SUB_ID_A_SQUARE_GET,
10 MIXIN_SUB_ID_LAST
11};
12
13#define MIXIN_ID(sub_id) (MIXIN_BASE_ID + sub_id)
14
15
16/**
17 * @def mixin_a_square_get(ret)
18 * @brief Get the square of a.
19 * @param[out] ret the square of a
20 */
21#define mixin_a_square_get(ret) MIXIN_ID(MIXIN_SUB_ID_A_SQUARE_GET), EO_TYPECHECK(int *, ret)
22
23#define MIXIN_CLASS mixin_class_get()
24const Eo_Class *mixin_class_get(void);
25
26#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 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include "Eo.h"
6#include "simple_simple.h"
7
8EAPI Eo_Op SIMPLE_BASE_ID = 0;
9
10typedef struct
11{
12 int a;
13} Private_Data;
14
15#define MY_CLASS SIMPLE_CLASS
16
17static void
18_a_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
19{
20 const Private_Data *pd = class_data;
21 int *a;
22 a = va_arg(*list, int *);
23 *a = pd->a;
24 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
25}
26
27static void
28_a_set(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
29{
30 Private_Data *pd = class_data;
31 int a;
32 a = va_arg(*list, int);
33 pd->a = a;
34 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
35}
36
37static void
38_a_power_3_get(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
39{
40 const Private_Data *pd = class_data;
41 int *ret;
42 ret = va_arg(*list, int *);
43 if (ret)
44 *ret = pd->a * pd->a * pd->a;
45 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
46}
47
48static void
49_class_constructor(Eo_Class *klass)
50{
51 const Eo_Op_Func_Description func_desc[] = {
52 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_SET), _a_set),
53 EO_OP_FUNC(SIMPLE_ID(SIMPLE_SUB_ID_A_GET), _a_get),
54 EO_OP_FUNC(INTERFACE_ID(INTERFACE_SUB_ID_A_POWER_3_GET), _a_power_3_get),
55 EO_OP_FUNC_SENTINEL
56 };
57
58 eo_class_funcs_set(klass, func_desc);
59}
60
61static const Eo_Op_Description op_desc[] = {
62 EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_SET, "Set property A"),
63 EO_OP_DESCRIPTION(SIMPLE_SUB_ID_A_GET, "Get property A"),
64 EO_OP_DESCRIPTION_SENTINEL
65};
66
67static const Eo_Class_Description class_desc = {
68 EO_VERSION,
69 "Simple",
70 EO_CLASS_TYPE_REGULAR,
71 EO_CLASS_DESCRIPTION_OPS(&SIMPLE_BASE_ID, op_desc, SIMPLE_SUB_ID_LAST),
72 NULL,
73 sizeof(Private_Data),
74 _class_constructor,
75 NULL
76};
77
78EO_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 @@
1#ifndef SIMPLE_H
2#define SIMPLE_H
3
4#include "Eo.h"
5#include "simple_interface.h"
6#include "simple_mixin.h"
7
8extern EAPI Eo_Op SIMPLE_BASE_ID;
9
10enum {
11 SIMPLE_SUB_ID_A_SET,
12 SIMPLE_SUB_ID_A_GET,
13 SIMPLE_SUB_ID_LAST
14};
15
16#define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
17
18/**
19 * @def simple_a_set(a)
20 * @brief Set value to a-property
21 * @param[in] a integer value to set
22 */
23#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
24
25/**
26 * @def simple_a_get(a)
27 * @brief Get value of a-property
28 * @param[out] integer pointer to a-value
29 */
30#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a)
31
32#define SIMPLE_CLASS simple_class_get()
33const Eo_Class *simple_class_get(void);
34
35#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
15SUBDIRS += eet 15SUBDIRS += eet
16 16
17endif 17endif
18
19if EFL_BUILD_EO
20
21SUBDIRS += eo
22
23endif
diff --git a/legacy/eobj/src/lib/Eo.h b/src/lib/eo/Eo.h
index ffb46fbeac..ffb46fbeac 100644
--- a/legacy/eobj/src/lib/Eo.h
+++ b/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 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/include/eina \
5-I$(top_srcdir)/src/lib/eo \
6-I$(top_builddir)/src/include/eina \
7-I$(top_builddir)/src/lib/eo \
8@EFL_EO_BUILD@ \
9@EO_CFLAGS@
10
11installed_headerdir = $(includedir)/eo-@VMAJ@
12dist_installed_header_DATA = Eo.h
13
14lib_LTLIBRARIES = libeo.la
15
16libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h
17libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@
18libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
19
20clean-local:
21 rm -rf *.gcno
diff --git a/legacy/eobj/src/lib/eo.c b/src/lib/eo/eo.c
index b2d8b82886..b2d8b82886 100644
--- a/legacy/eobj/src/lib/eo.c
+++ b/src/lib/eo/eo.c
diff --git a/legacy/eobj/src/lib/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 4657da2bbc..4657da2bbc 100644
--- a/legacy/eobj/src/lib/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
diff --git a/legacy/eobj/src/lib/eo_private.h b/src/lib/eo/eo_private.h
index 0045645701..0045645701 100644
--- a/legacy/eobj/src/lib/eo_private.h
+++ b/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
7SUBDIRS += eet 7SUBDIRS += eet
8 8
9endif 9endif
10
11if EFL_BUILD_EO
12
13SUBDIRS += eo
14
15endif
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 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib/eo \
5-I$(top_builddir)/src/lib/eo \
6@EFL_EO_BUILD@ \
7@EO_CFLAGS@ \
8@CHECK_CFLAGS@
9
10check_PROGRAMS = \
11test_access \
12test_composite_objects \
13test_constructors \
14test_function_overrides \
15test_interface \
16test_mixin \
17test_signals
18
19if EFL_ENABLE_TESTS
20check_PROGRAMS += eo_suite
21endif
22
23test_access_SOURCES = \
24access/access_inherit.c \
25access/access_inherit.h \
26access/access_main.c \
27access/access_simple.c \
28access/access_simple.h \
29access/access_simple_protected.h
30
31test_access_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
32
33test_composite_objects_SOURCES = \
34composite_objects/composite_objects_comp.c \
35composite_objects/composite_objects_comp.h \
36composite_objects/composite_objects_main.c \
37composite_objects/composite_objects_simple.c \
38composite_objects/composite_objects_simple.h
39
40test_composite_objects_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
41
42test_constructors_SOURCES = \
43constructors/constructors_main.c \
44constructors/constructors_mixin.c \
45constructors/constructors_mixin.h \
46constructors/constructors_simple.c \
47constructors/constructors_simple.h \
48constructors/constructors_simple2.c \
49constructors/constructors_simple2.h \
50constructors/constructors_simple3.c \
51constructors/constructors_simple3.h \
52constructors/constructors_simple4.c \
53constructors/constructors_simple4.h \
54constructors/constructors_simple5.c \
55constructors/constructors_simple5.h \
56constructors/constructors_simple6.c \
57constructors/constructors_simple6.h \
58constructors/constructors_simple7.c \
59constructors/constructors_simple7.h
60
61test_constructors_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
62
63if EFL_ENABLE_TESTS
64
65eo_suite_SOURCES = \
66suite/eo_test_class_simple.c \
67suite/eo_test_class_simple.h \
68suite/eo_suite.c \
69suite/eo_suite.h \
70suite/eo_test_class_errors.c \
71suite/eo_test_general.c \
72suite/eo_test_init.c
73
74eo_suite_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ @CHECK_LIBS@
75
76endif
77
78test_function_overrides_SOURCES = \
79function_overrides/function_overrides_inherit.c \
80function_overrides/function_overrides_inherit.h \
81function_overrides/function_overrides_inherit2.c \
82function_overrides/function_overrides_inherit2.h \
83function_overrides/function_overrides_inherit3.c \
84function_overrides/function_overrides_inherit3.h \
85function_overrides/function_overrides_main.c \
86function_overrides/function_overrides_simple.c \
87function_overrides/function_overrides_simple.h
88
89test_function_overrides_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
90
91test_interface_SOURCES = \
92interface/interface_interface.c \
93interface/interface_interface.h \
94interface/interface_interface2.c \
95interface/interface_interface2.h \
96interface/interface_main.c \
97interface/interface_simple.c \
98interface/interface_simple.h
99
100test_interface_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
101
102test_mixin_SOURCES = \
103mixin/mixin_inherit.c \
104mixin/mixin_inherit.h \
105mixin/mixin_main.c \
106mixin/mixin_mixin.c \
107mixin/mixin_mixin.h \
108mixin/mixin_mixin2.c \
109mixin/mixin_mixin2.h \
110mixin/mixin_mixin3.c \
111mixin/mixin_mixin3.h \
112mixin/mixin_mixin4.c \
113mixin/mixin_mixin4.h \
114mixin/mixin_simple.c \
115mixin/mixin_simple.h
116
117test_mixin_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
118
119test_signals_SOURCES = \
120signals/signals_main.c \
121signals/signals_simple.c \
122signals/signals_simple.h
123
124test_signals_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
125
126EXTRA_DIST = eunit_tests.h
diff --git a/legacy/eobj/src/tests/access/inherit.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "access_simple.h"
7#include "simple_protected.h" 7#include "access_simple_protected.h"
8 8#include "access_inherit.h"
9#include "inherit.h"
10 9
11EAPI Eo_Op INHERIT_BASE_ID = 0; 10EAPI Eo_Op INHERIT_BASE_ID = 0;
12 11
diff --git a/legacy/eobj/src/tests/access/inherit.h b/src/tests/eo/access/access_inherit.h
index f701dae484..f701dae484 100644
--- a/legacy/eobj/src/tests/access/inherit.h
+++ b/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
index c211698d83..474f3b9a49 100644
--- a/legacy/eobj/src/tests/access/main.c
+++ b/src/tests/eo/access/access_main.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "access_simple.h"
7#include "inherit.h" 7#include "access_inherit.h"
8 8
9int 9int
10main(int argc, char *argv[]) 10main(int argc, char *argv[])
diff --git a/legacy/eobj/src/tests/access/simple.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "access_simple.h"
7#include "simple_protected.h" 7#include "access_simple_protected.h"
8 8
9EAPI Eo_Op SIMPLE_BASE_ID = 0; 9EAPI Eo_Op SIMPLE_BASE_ID = 0;
10 10
diff --git a/legacy/eobj/src/tests/access/simple.h b/src/tests/eo/access/access_simple.h
index 11624b7d20..11624b7d20 100644
--- a/legacy/eobj/src/tests/access/simple.h
+++ b/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
index 3cabcd804b..3cabcd804b 100644
--- a/legacy/eobj/src/tests/access/simple_protected.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "composite_objects_simple.h"
7#include "comp.h" 7#include "composite_objects_comp.h"
8 8
9#include "../eunit_tests.h" 9#include "../eunit_tests.h"
10 10
diff --git a/legacy/eobj/src/tests/composite_objects/comp.h b/src/tests/eo/composite_objects/composite_objects_comp.h
index 95001b7020..95001b7020 100644
--- a/legacy/eobj/src/tests/composite_objects/comp.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "composite_objects_simple.h"
7#include "comp.h" 7#include "composite_objects_comp.h"
8 8
9#include "../eunit_tests.h" 9#include "../eunit_tests.h"
10 10
diff --git a/legacy/eobj/src/tests/composite_objects/simple.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "composite_objects_simple.h"
7 7
8EAPI Eo_Op SIMPLE_BASE_ID = 0; 8EAPI Eo_Op SIMPLE_BASE_ID = 0;
9 9
diff --git a/legacy/eobj/src/tests/composite_objects/simple.h b/src/tests/eo/composite_objects/composite_objects_simple.h
index 32a62465b8..32a62465b8 100644
--- a/legacy/eobj/src/tests/composite_objects/simple.h
+++ b/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
index 21bf4b449c..c7db62d398 100644
--- a/legacy/eobj/src/tests/constructors/main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -3,14 +3,14 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "constructors_simple.h"
7#include "simple2.h" 7#include "constructors_simple2.h"
8#include "simple3.h" 8#include "constructors_simple3.h"
9#include "simple4.h" 9#include "constructors_simple4.h"
10#include "simple5.h" 10#include "constructors_simple5.h"
11#include "simple6.h" 11#include "constructors_simple6.h"
12#include "simple7.h" 12#include "constructors_simple7.h"
13#include "mixin.h" 13#include "constructors_mixin.h"
14 14
15#include "../eunit_tests.h" 15#include "../eunit_tests.h"
16 16
diff --git a/legacy/eobj/src/tests/constructors/mixin.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple.h" 7#include "constructors_simple.h"
8 8
9EAPI Eo_Op MIXIN_BASE_ID = 0; 9EAPI Eo_Op MIXIN_BASE_ID = 0;
10 10
diff --git a/legacy/eobj/src/tests/constructors/mixin.h b/src/tests/eo/constructors/constructors_mixin.h
index 9998b274f4..9998b274f4 100644
--- a/legacy/eobj/src/tests/constructors/mixin.h
+++ b/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
index f56828c5b6..b598650d73 100644
--- a/legacy/eobj/src/tests/constructors/simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple.h" 7#include "constructors_simple.h"
8 8
9EAPI Eo_Op SIMPLE_BASE_ID = 0; 9EAPI Eo_Op SIMPLE_BASE_ID = 0;
10 10
diff --git a/legacy/eobj/src/tests/constructors/simple.h b/src/tests/eo/constructors/constructors_simple.h
index 7342d3402e..7342d3402e 100644
--- a/legacy/eobj/src/tests/constructors/simple.h
+++ b/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
index 86c1aeafda..8aa771719d 100644
--- a/legacy/eobj/src/tests/constructors/simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple2.h" 7#include "constructors_simple2.h"
8 8
9#define MY_CLASS SIMPLE2_CLASS 9#define MY_CLASS SIMPLE2_CLASS
10 10
diff --git a/legacy/eobj/src/tests/constructors/simple2.h b/src/tests/eo/constructors/constructors_simple2.h
index e6549f3d2a..e6549f3d2a 100644
--- a/legacy/eobj/src/tests/constructors/simple2.h
+++ b/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
index f671b4b24c..13453b76e3 100644
--- a/legacy/eobj/src/tests/constructors/simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple3.h" 7#include "constructors_simple3.h"
8 8
9#define MY_CLASS SIMPLE3_CLASS 9#define MY_CLASS SIMPLE3_CLASS
10 10
diff --git a/legacy/eobj/src/tests/constructors/simple3.h b/src/tests/eo/constructors/constructors_simple3.h
index e27f8f1ce4..e27f8f1ce4 100644
--- a/legacy/eobj/src/tests/constructors/simple3.h
+++ b/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
index 95cfa73003..abce301e3a 100644
--- a/legacy/eobj/src/tests/constructors/simple4.c
+++ b/src/tests/eo/constructors/constructors_simple4.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple.h" 7#include "constructors_simple.h"
8#include "simple4.h" 8#include "constructors_simple4.h"
9 9
10#define MY_CLASS SIMPLE4_CLASS 10#define MY_CLASS SIMPLE4_CLASS
11 11
diff --git a/legacy/eobj/src/tests/constructors/simple4.h b/src/tests/eo/constructors/constructors_simple4.h
index fe8e862e6d..fe8e862e6d 100644
--- a/legacy/eobj/src/tests/constructors/simple4.h
+++ b/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
index 9ff6d49468..bd2f1a5b3b 100644
--- a/legacy/eobj/src/tests/constructors/simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple5.h" 7#include "constructors_simple5.h"
8 8
9#define MY_CLASS SIMPLE5_CLASS 9#define MY_CLASS SIMPLE5_CLASS
10 10
diff --git a/legacy/eobj/src/tests/constructors/simple5.h b/src/tests/eo/constructors/constructors_simple5.h
index 9b262d4463..9b262d4463 100644
--- a/legacy/eobj/src/tests/constructors/simple5.h
+++ b/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
index 7c224d75f2..561556d4b0 100644
--- a/legacy/eobj/src/tests/constructors/simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple6.h" 7#include "constructors_simple6.h"
8 8
9#define MY_CLASS SIMPLE6_CLASS 9#define MY_CLASS SIMPLE6_CLASS
10 10
diff --git a/legacy/eobj/src/tests/constructors/simple6.h b/src/tests/eo/constructors/constructors_simple6.h
index 97e7b5e360..97e7b5e360 100644
--- a/legacy/eobj/src/tests/constructors/simple6.h
+++ b/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
index 42af6cf8c2..de197bf4f4 100644
--- a/legacy/eobj/src/tests/constructors/simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "constructors_mixin.h"
7#include "simple7.h" 7#include "constructors_simple7.h"
8#include "simple2.h" 8#include "constructors_simple2.h"
9 9
10#include "../eunit_tests.h" 10#include "../eunit_tests.h"
11 11
diff --git a/legacy/eobj/src/tests/constructors/simple7.h b/src/tests/eo/constructors/constructors_simple7.h
index a9a201e447..a9a201e447 100644
--- a/legacy/eobj/src/tests/constructors/simple7.h
+++ b/src/tests/eo/constructors/constructors_simple7.h
diff --git a/legacy/eobj/src/tests/eunit_tests.h b/src/tests/eo/eunit_tests.h
index 000d18c015..000d18c015 100644
--- a/legacy/eobj/src/tests/eunit_tests.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "function_overrides_simple.h"
7#include "inherit.h" 7#include "function_overrides_inherit.h"
8 8
9#define MY_CLASS INHERIT_CLASS 9#define MY_CLASS INHERIT_CLASS
10 10
diff --git a/legacy/eobj/src/tests/function_overrides/inherit.h b/src/tests/eo/function_overrides/function_overrides_inherit.h
index 2f33647958..2f33647958 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "function_overrides_simple.h"
7#include "inherit.h" 7#include "function_overrides_inherit.h"
8#include "inherit2.h" 8#include "function_overrides_inherit2.h"
9 9
10#include "../eunit_tests.h" 10#include "../eunit_tests.h"
11 11
diff --git a/legacy/eobj/src/tests/function_overrides/inherit2.h b/src/tests/eo/function_overrides/function_overrides_inherit2.h
index 2bc0b0d36a..2bc0b0d36a 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit2.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "function_overrides_simple.h"
7#include "inherit2.h" 7#include "function_overrides_inherit2.h"
8#include "inherit3.h" 8#include "function_overrides_inherit3.h"
9 9
10#define MY_CLASS INHERIT3_CLASS 10#define MY_CLASS INHERIT3_CLASS
11 11
diff --git a/legacy/eobj/src/tests/function_overrides/inherit3.h b/src/tests/eo/function_overrides/function_overrides_inherit3.h
index 73436ba239..73436ba239 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit3.h
+++ b/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
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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "function_overrides_simple.h"
7#include "inherit.h" 7#include "function_overrides_inherit.h"
8#include "inherit2.h" 8#include "function_overrides_inherit2.h"
9#include "inherit3.h" 9#include "function_overrides_inherit3.h"
10 10
11#include "../eunit_tests.h" 11#include "../eunit_tests.h"
12 12
diff --git a/legacy/eobj/src/tests/function_overrides/simple.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "function_overrides_simple.h"
7 7
8#include "../eunit_tests.h" 8#include "../eunit_tests.h"
9 9
diff --git a/legacy/eobj/src/tests/function_overrides/simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h
index 3a620fa611..3a620fa611 100644
--- a/legacy/eobj/src/tests/function_overrides/simple.h
+++ b/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
index 27a986bc17..c0dec7649d 100644
--- a/legacy/eobj/src/tests/interface/interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "interface.h" 6#include "interface_interface.h"
7#include "simple.h" 7#include "interface_simple.h"
8 8
9EAPI Eo_Op INTERFACE_BASE_ID = 0; 9EAPI Eo_Op INTERFACE_BASE_ID = 0;
10 10
diff --git a/legacy/eobj/src/tests/interface/interface.h b/src/tests/eo/interface/interface_interface.h
index 4e161b8488..4e161b8488 100644
--- a/legacy/eobj/src/tests/interface/interface.h
+++ b/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
index 74619dbdbd..14d3f1d0f8 100644
--- a/legacy/eobj/src/tests/interface/interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "interface.h" 6#include "interface_interface.h"
7#include "interface2.h" 7#include "interface_interface2.h"
8#include "simple.h" 8#include "interface_simple.h"
9 9
10EAPI Eo_Op INTERFACE2_BASE_ID = 0; 10EAPI Eo_Op INTERFACE2_BASE_ID = 0;
11 11
diff --git a/legacy/eobj/src/tests/interface/interface2.h b/src/tests/eo/interface/interface_interface2.h
index 5aa91f4fdc..5aa91f4fdc 100644
--- a/legacy/eobj/src/tests/interface/interface2.h
+++ b/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
index 0abe495456..5fa65266f6 100644
--- a/legacy/eobj/src/tests/interface/main.c
+++ b/src/tests/eo/interface/interface_main.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "interface_simple.h"
7#include "interface.h" 7#include "interface_interface.h"
8#include "interface2.h" 8#include "interface_interface2.h"
9 9
10#include "../eunit_tests.h" 10#include "../eunit_tests.h"
11 11
diff --git a/legacy/eobj/src/tests/interface/simple.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "interface.h" 6#include "interface_interface.h"
7#include "interface2.h" 7#include "interface_interface2.h"
8#include "simple.h" 8#include "interface_simple.h"
9 9
10EAPI Eo_Op SIMPLE_BASE_ID = 0; 10EAPI Eo_Op SIMPLE_BASE_ID = 0;
11 11
diff --git a/legacy/eobj/src/tests/interface/simple.h b/src/tests/eo/interface/interface_simple.h
index 8df8131278..8df8131278 100644
--- a/legacy/eobj/src/tests/interface/simple.h
+++ b/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
index f23ec41e22..4dc8fd9e15 100644
--- a/legacy/eobj/src/tests/mixin/inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "mixin_simple.h"
7#include "mixin4.h" 7#include "mixin_mixin4.h"
8#include "inherit.h" 8#include "mixin_inherit.h"
9 9
10#define MY_CLASS INHERIT_CLASS 10#define MY_CLASS INHERIT_CLASS
11 11
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 @@
1#ifndef INHERIT_H
2#define INHERIT_H
3
4#define INHERIT_CLASS inherit_class_get()
5const Eo_Class *inherit_class_get(void);
6
7#endif
diff --git a/legacy/eobj/src/tests/mixin/main.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "mixin_simple.h"
7#include "inherit.h" 7#include "mixin_inherit.h"
8#include "mixin.h" 8#include "mixin_mixin.h"
9#include "mixin2.h" 9#include "mixin_mixin2.h"
10#include "mixin3.h" 10#include "mixin_mixin3.h"
11 11
12#include "../eunit_tests.h" 12#include "../eunit_tests.h"
13 13
diff --git a/legacy/eobj/src/tests/mixin/mixin.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "mixin_mixin.h"
7#include "simple.h" 7#include "mixin_simple.h"
8 8
9EAPI Eo_Op MIXIN_BASE_ID = 0; 9EAPI Eo_Op MIXIN_BASE_ID = 0;
10 10
diff --git a/legacy/eobj/src/tests/mixin/mixin.h b/src/tests/eo/mixin/mixin_mixin.h
index 745e5c4683..745e5c4683 100644
--- a/legacy/eobj/src/tests/mixin/mixin.h
+++ b/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
index a6eb82db53..dbd7c97d00 100644
--- a/legacy/eobj/src/tests/mixin/mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "mixin_mixin.h"
7#include "mixin2.h" 7#include "mixin_mixin2.h"
8#include "simple.h" 8#include "mixin_simple.h"
9 9
10#include "../eunit_tests.h" 10#include "../eunit_tests.h"
11 11
diff --git a/legacy/eobj/src/tests/mixin/mixin2.h b/src/tests/eo/mixin/mixin_mixin2.h
index 6e4b692d41..6e4b692d41 100644
--- a/legacy/eobj/src/tests/mixin/mixin2.h
+++ b/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
index 62468afef0..08c2b5cc7b 100644
--- a/legacy/eobj/src/tests/mixin/mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "mixin_mixin.h"
7#include "mixin3.h" 7#include "mixin_mixin3.h"
8#include "simple.h" 8#include "mixin_simple.h"
9 9
10#include "../eunit_tests.h" 10#include "../eunit_tests.h"
11 11
diff --git a/legacy/eobj/src/tests/mixin/mixin3.h b/src/tests/eo/mixin/mixin_mixin3.h
index 36b32c0aa8..36b32c0aa8 100644
--- a/legacy/eobj/src/tests/mixin/mixin3.h
+++ b/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
index 185884156b..cf8f16f965 100644
--- a/legacy/eobj/src/tests/mixin/mixin4.c
+++ b/src/tests/eo/mixin/mixin_mixin4.c
@@ -3,9 +3,9 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "mixin_mixin.h"
7#include "mixin4.h" 7#include "mixin_mixin4.h"
8#include "simple.h" 8#include "mixin_simple.h"
9 9
10#include "../eunit_tests.h" 10#include "../eunit_tests.h"
11 11
diff --git a/legacy/eobj/src/tests/mixin/mixin4.h b/src/tests/eo/mixin/mixin_mixin4.h
index 7b520fad19..7b520fad19 100644
--- a/legacy/eobj/src/tests/mixin/mixin4.h
+++ b/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
index d7b95f2e85..ff4600d727 100644
--- a/legacy/eobj/src/tests/mixin/simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -3,10 +3,10 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "mixin.h" 6#include "mixin_mixin.h"
7#include "mixin2.h" 7#include "mixin_mixin2.h"
8#include "mixin3.h" 8#include "mixin_mixin3.h"
9#include "simple.h" 9#include "mixin_simple.h"
10 10
11EAPI Eo_Op SIMPLE_BASE_ID = 0; 11EAPI Eo_Op SIMPLE_BASE_ID = 0;
12 12
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 @@
1#ifndef SIMPLE_H
2#define SIMPLE_H
3
4extern EAPI Eo_Op SIMPLE_BASE_ID;
5
6enum {
7 SIMPLE_SUB_ID_A_SET,
8 SIMPLE_SUB_ID_A_GET,
9 SIMPLE_SUB_ID_B_SET,
10 SIMPLE_SUB_ID_B_GET,
11 SIMPLE_SUB_ID_LAST
12};
13
14#define SIMPLE_ID(sub_id) (SIMPLE_BASE_ID + sub_id)
15
16/**
17 * @def simple_a_set(a)
18 * @brief Set value to a-property
19 * @param[in] a integer value to set
20 */
21#define simple_a_set(a) SIMPLE_ID(SIMPLE_SUB_ID_A_SET), EO_TYPECHECK(int, a)
22
23/**
24 * @def simple_a_get(a)
25 * @brief Get value of a-property
26 * @param[out] integer pointer to a-value
27 */
28#define simple_a_get(a) SIMPLE_ID(SIMPLE_SUB_ID_A_GET), EO_TYPECHECK(int *, a)
29
30/**
31 * @def simple_b_set(b)
32 * @brief Set value to b-property
33 * @param[in] a integer value to set
34 */
35#define simple_b_set(b) SIMPLE_ID(SIMPLE_SUB_ID_B_SET), EO_TYPECHECK(int, b)
36
37/**
38 * @def simple_b_get(b)
39 * @brief Get value of b-property
40 * @param[out] integer pointer to b-value
41 */
42#define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
43
44#define SIMPLE_CLASS simple_class_get()
45const Eo_Class *simple_class_get(void);
46
47#endif
diff --git a/legacy/eobj/src/tests/signals/main.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "signals_simple.h"
7 7
8#include "../eunit_tests.h" 8#include "../eunit_tests.h"
9 9
diff --git a/legacy/eobj/src/tests/signals/simple.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "simple.h" 6#include "signals_simple.h"
7 7
8EAPI Eo_Op SIMPLE_BASE_ID = 0; 8EAPI Eo_Op SIMPLE_BASE_ID = 0;
9 9
diff --git a/legacy/eobj/src/tests/signals/simple.h b/src/tests/eo/signals/signals_simple.h
index d1f63bdd06..d1f63bdd06 100644
--- a/legacy/eobj/src/tests/signals/simple.h
+++ b/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
index 0494136cef..0494136cef 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_suite.c
+++ b/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
index 9d79f42f8e..9d79f42f8e 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_suite.h
+++ b/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
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 @@
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "eo_suite.h" 8#include "eo_suite.h"
9#include "class_simple.h" 9#include "eo_test_class_simple.h"
10 10
11START_TEST(eo_incomplete_desc) 11START_TEST(eo_incomplete_desc)
12{ 12{
diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.c b/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 @@
3#endif 3#endif
4 4
5#include "Eo.h" 5#include "Eo.h"
6#include "class_simple.h" 6#include "eo_test_class_simple.h"
7 7
8#define MY_CLASS SIMPLE_CLASS 8#define MY_CLASS SIMPLE_CLASS
9 9
diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h
index 9980b7b93a..9980b7b93a 100644
--- a/legacy/eobj/src/tests/eo_suite/class_simple.h
+++ b/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
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 @@
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "eo_suite.h" 8#include "eo_suite.h"
9#include "class_simple.h" 9#include "eo_test_class_simple.h"
10 10
11START_TEST(eo_simple) 11START_TEST(eo_simple)
12{ 12{
diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c
index 3bf4b49cb7..3bf4b49cb7 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_test_init.c
+++ b/src/tests/eo/suite/eo_test_init.c