From e3c8b280c639058c54f5576f189d0dc288105fc7 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Mon, 23 May 2016 12:01:30 -0300 Subject: [PATCH] c++: Reorganized C++ binding generation Moved all generation to a single Makefile_Cxx.am file instead of throughout the whole project. And fixed C++ generation on Elementary after elm merge. --- m4/efl.m4 | 2 +- src/Makefile.am | 12 +- src/Makefile_Cxx.am | 351 ++++++++++++++++++ src/Makefile_Ecore.am | 7 + src/Makefile_Ecore_Audio.am | 1 - src/Makefile_Ecore_Audio_Cxx.am | 52 --- src/Makefile_Ecore_Cxx.am | 66 ---- src/Makefile_Edje.am | 5 + src/Makefile_Edje_Cxx.am | 44 --- src/Makefile_Eet_Cxx.am | 35 -- src/Makefile_Efl.am | 4 + src/Makefile_Efl_Cxx.am | 24 -- src/Makefile_Eina_Cxx.am | 101 ----- src/Makefile_Eio.am | 19 +- src/Makefile_Eio_Cxx.am | 23 -- src/Makefile_Eldbus.am | 5 + src/Makefile_Eldbus_Cxx.am | 73 ---- src/Makefile_Elementary.am | 5 + src/Makefile_Elementary_Cxx.am | 54 --- src/Makefile_Eo.am | 7 + src/Makefile_Eo_Cxx.am | 34 -- src/Makefile_Eolian_Cxx.am | 1 + src/Makefile_Evas.am | 5 + src/Makefile_Evas_Cxx.am | 48 --- src/bin/eolian_cxx/type_lookup_table.cc | 18 +- src/bindings/{ => cxx}/ecore_cxx/Ecore.hh | 0 src/bindings/{ => cxx}/eet_cxx/Eet.hh | 0 .../{ => cxx}/eet_cxx/eet_composite.hh | 0 .../{ => cxx}/eet_cxx/eet_register.hh | 0 src/bindings/{ => cxx}/eet_cxx/eet_type.hh | 0 src/bindings/{ => cxx}/eina_cxx/Eina.hh | 0 .../{ => cxx}/eina_cxx/eina_accessor.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_array.hh | 0 .../eina_cxx/eina_clone_allocators.hh | 0 .../eina_cxx/eina_eo_concrete_fwd.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_error.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_fold.hh | 0 .../{ => cxx}/eina_cxx/eina_function.hh | 0 .../{ => cxx}/eina_cxx/eina_inarray.hh | 0 .../{ => cxx}/eina_cxx/eina_inlist.hh | 0 .../eina_cxx/eina_integer_sequence.hh | 0 .../{ => cxx}/eina_cxx/eina_iterator.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_list.hh | 0 .../eina_cxx/eina_lists_auxiliary.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_log.hh | 0 .../{ => cxx}/eina_cxx/eina_logical.hh | 0 .../{ => cxx}/eina_cxx/eina_optional.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_pp.hh | 0 .../{ => cxx}/eina_cxx/eina_ptrarray.hh | 0 .../{ => cxx}/eina_cxx/eina_ptrlist.hh | 0 .../{ => cxx}/eina_cxx/eina_range_types.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_ref.hh | 0 .../{ => cxx}/eina_cxx/eina_string_view.hh | 0 .../{ => cxx}/eina_cxx/eina_stringshare.hh | 0 .../{ => cxx}/eina_cxx/eina_thread.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_throw.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_tuple.hh | 0 .../{ => cxx}/eina_cxx/eina_tuple_c.hh | 0 .../{ => cxx}/eina_cxx/eina_tuple_unwrap.hh | 0 .../{ => cxx}/eina_cxx/eina_type_traits.hh | 0 src/bindings/{ => cxx}/eina_cxx/eina_value.hh | 0 src/bindings/{ => cxx}/eldbus_cxx/Eldbus.hh | 0 .../{ => cxx}/eldbus_cxx/eldbus_basic.hh | 0 .../{ => cxx}/eldbus_cxx/eldbus_error.hh | 0 .../eldbus_cxx/eldbus_freedesktop.hh | 0 .../eldbus_cxx/eldbus_integer_sequence.hh | 0 .../{ => cxx}/eldbus_cxx/eldbus_message.hh | 0 .../eldbus_cxx/eldbus_message_arguments.hh | 0 .../{ => cxx}/eldbus_cxx/eldbus_proxy_call.hh | 0 .../{ => cxx}/eldbus_cxx/eldbus_raw_tuple.hh | 0 .../{ => cxx}/eldbus_cxx/eldbus_service.hh | 0 .../eldbus_cxx/eldbus_signature_traits.hh | 0 src/bindings/{ => cxx}/eo_cxx/Eo.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_concrete.hh | 0 .../{ => cxx}/eo_cxx/eo_cxx_interop.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_event.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_inherit.hh | 0 .../{ => cxx}/eo_cxx/eo_inherit_bindings.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_init.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_ops.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_private.hh | 0 src/bindings/{ => cxx}/eo_cxx/eo_wref.hh | 0 src/lib/elementary/elm_image.eo | 2 +- src/tests/elementary_cxx/cxx_compile_test.cc | 14 + 84 files changed, 429 insertions(+), 583 deletions(-) create mode 100644 src/Makefile_Cxx.am delete mode 100644 src/Makefile_Ecore_Audio_Cxx.am delete mode 100644 src/Makefile_Ecore_Cxx.am delete mode 100644 src/Makefile_Edje_Cxx.am delete mode 100644 src/Makefile_Eet_Cxx.am delete mode 100644 src/Makefile_Efl_Cxx.am delete mode 100644 src/Makefile_Eina_Cxx.am delete mode 100644 src/Makefile_Eio_Cxx.am delete mode 100644 src/Makefile_Eldbus_Cxx.am delete mode 100644 src/Makefile_Elementary_Cxx.am delete mode 100644 src/Makefile_Eo_Cxx.am delete mode 100644 src/Makefile_Evas_Cxx.am rename src/bindings/{ => cxx}/ecore_cxx/Ecore.hh (100%) rename src/bindings/{ => cxx}/eet_cxx/Eet.hh (100%) rename src/bindings/{ => cxx}/eet_cxx/eet_composite.hh (100%) rename src/bindings/{ => cxx}/eet_cxx/eet_register.hh (100%) rename src/bindings/{ => cxx}/eet_cxx/eet_type.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/Eina.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_accessor.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_array.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_clone_allocators.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_eo_concrete_fwd.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_error.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_fold.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_function.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_inarray.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_inlist.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_integer_sequence.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_iterator.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_list.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_lists_auxiliary.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_log.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_logical.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_optional.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_pp.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_ptrarray.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_ptrlist.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_range_types.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_ref.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_string_view.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_stringshare.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_thread.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_throw.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_tuple.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_tuple_c.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_tuple_unwrap.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_type_traits.hh (100%) rename src/bindings/{ => cxx}/eina_cxx/eina_value.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/Eldbus.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_basic.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_error.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_freedesktop.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_integer_sequence.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_message.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_message_arguments.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_proxy_call.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_raw_tuple.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_service.hh (100%) rename src/bindings/{ => cxx}/eldbus_cxx/eldbus_signature_traits.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/Eo.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_concrete.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_cxx_interop.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_event.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_inherit.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_inherit_bindings.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_init.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_ops.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_private.hh (100%) rename src/bindings/{ => cxx}/eo_cxx/eo_wref.hh (100%) create mode 100644 src/tests/elementary_cxx/cxx_compile_test.cc diff --git a/m4/efl.m4 b/m4/efl.m4 index ea686b7e4c..990f629f46 100644 --- a/m4/efl.m4 +++ b/m4/efl.m4 @@ -412,7 +412,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS} m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la" -m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1" +m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1" requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}" requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}" diff --git a/src/Makefile.am b/src/Makefile.am index eaf756965f..af019a7bc1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,7 +57,6 @@ include Makefile_Eeze.am include Makefile_Ecore_Drm.am include Makefile_Ecore_Evas.am include Makefile_Ecore_Audio.am -include Makefile_Ecore_Audio_Cxx.am include Makefile_Ecore_Avahi.am include Makefile_Embryo.am include Makefile_Eio.am @@ -72,17 +71,8 @@ include Makefile_Elocation.am include Makefile_Elementary.am include Makefile_Elput.am -include Makefile_Eina_Cxx.am -include Makefile_Ecore_Cxx.am -include Makefile_Eldbus_Cxx.am +include Makefile_Cxx.am include Makefile_Eolian_Cxx.am -include Makefile_Eet_Cxx.am -include Makefile_Eo_Cxx.am -include Makefile_Efl_Cxx.am -include Makefile_Edje_Cxx.am -include Makefile_Evas_Cxx.am -include Makefile_Eio_Cxx.am -include Makefile_Elementary_Cxx.am include Makefile_Elua.am diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am new file mode 100644 index 0000000000..809ce99d8a --- /dev/null +++ b/src/Makefile_Cxx.am @@ -0,0 +1,351 @@ +if HAVE_CXX11 + +### Eo C++ +CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) + +installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/ +nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl) +dist_installed_eocxxheaders_DATA = \ +bindings/cxx/eo_cxx/eo_concrete.hh \ +bindings/cxx/eo_cxx/eo_event.hh \ +bindings/cxx/eo_cxx/eo_init.hh \ +bindings/cxx/eo_cxx/eo_wref.hh \ +bindings/cxx/eo_cxx/eo_inherit.hh \ +bindings/cxx/eo_cxx/eo_ops.hh \ +bindings/cxx/eo_cxx/eo_private.hh \ +bindings/cxx/eo_cxx/eo_inherit_bindings.hh \ +bindings/cxx/eo_cxx/eo_cxx_interop.hh \ +bindings/cxx/eo_cxx/Eo.hh + +### Elementary C++ +installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/ +nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl) \ +lib/elementary/Elementary.hh + +lib/elementary/Elementary.hh: $(elementary_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_ELEMENTARY_HH\n#define EFL_CXX_ELEMENTARY_HH\n" > $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H)" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#error Do not include Elm C API headers before including Elementary.hh" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#endif" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#ifndef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#define EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#ifndef ELM_INTERNAL_API_ARGESFSDFEFC" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#define ELM_INTERNAL_API_ARGESFSDFEFC" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "extern \"C\" {" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#include \"Elementary.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "#include \"elm_widget.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "}" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh + @for i in $(elementary_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/elementary/Elementary.hh; done + @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh + +CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl) lib/elementary/Elementary.hh + +### Efl C++ +installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/ +nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl) lib/efl/Efl.hh + +lib/efl/Efl.hh: $(efl_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh + @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/efl/Efl.hh + @for i in $(efl_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done + @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh + +CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl) lib/efl/Efl.hh + +### Evas C++ +installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ +nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh + +installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas +nodist_installed_evascxxcanvasheaders_DATA = $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl) + +lib/evas/Evas.hh: $(evas_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh + @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/evas/Evas.hh + @for i in $(evas_eolian_cxx_hh); do echo "#include " >> $(top_builddir)/src/lib/evas/Evas.hh; done + @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh + +CLEANFILES += $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl) lib/evas/Evas.hh + +### Eldbus C++ +installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ +nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl) lib/eldbus/Eldbus_Model.hh +dist_installed_eldbuscxxmainheaders_DATA = \ +bindings/cxx/eldbus_cxx/eldbus_basic.hh \ +bindings/cxx/eldbus_cxx/eldbus_error.hh \ +bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh \ +bindings/cxx/eldbus_cxx/Eldbus.hh \ +bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh \ +bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh \ +bindings/cxx/eldbus_cxx/eldbus_message.hh \ +bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh \ +bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh \ +bindings/cxx/eldbus_cxx/eldbus_service.hh \ +bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh + +lib/eldbus/Eldbus_Model.hh: $(eldbus_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_ELDBUS_MODEL_HH\n#define EFL_CXX_ELDBUS_MODEL_HH\n" > $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh + @echo @ECHO_E@ "#include " >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh + @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh + @for i in $(eldbus_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh; done + @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh + +CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl) lib/eldbus/Eldbus_Model.hh + +### Eet C++ +installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@ +dist_installed_eetcxxheaders_DATA = \ +bindings/cxx/eet_cxx/eet_composite.hh \ +bindings/cxx/eet_cxx/eet_register.hh \ +bindings/cxx/eet_cxx/eet_type.hh \ +bindings/cxx/eet_cxx/Eet.hh + +### Generated headers src/lib/edje +installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ +nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) lib/edje/Edje.hh + +lib/edje/Edje.hh: $(edje_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh + @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/edje/Edje.hh + @for i in $(edje_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done + @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh + +CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) lib/edje/Edje.hh + +### Ecore src/lib/ecore +installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ +nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl) \ +bindings/cxx/ecore_cxx/Ecore.hh \ +lib/ecore/Ecore.eo.hh + +lib/ecore/Ecore.eo.hh: $(ecore_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_HH\n#define EFL_CXX_ECORE_HH\n" > $(top_builddir)/src/lib/ecore/Ecore.eo.hh + @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh + @for i in $(ecore_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done + @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh + +CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl) llib/ecore/Ecore.eo.hh + +## Eina src/lib/eina +installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@ +dist_installed_einacxxheaders_DATA = \ +bindings/cxx/eina_cxx/eina_accessor.hh \ +bindings/cxx/eina_cxx/eina_array.hh \ +bindings/cxx/eina_cxx/eina_clone_allocators.hh \ +bindings/cxx/eina_cxx/eina_error.hh \ +bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh \ +bindings/cxx/eina_cxx/eina_fold.hh \ +bindings/cxx/eina_cxx/eina_function.hh \ +bindings/cxx/eina_cxx/eina_inarray.hh \ +bindings/cxx/eina_cxx/eina_inlist.hh \ +bindings/cxx/eina_cxx/eina_integer_sequence.hh \ +bindings/cxx/eina_cxx/eina_iterator.hh \ +bindings/cxx/eina_cxx/eina_lists_auxiliary.hh \ +bindings/cxx/eina_cxx/eina_list.hh \ +bindings/cxx/eina_cxx/eina_log.hh \ +bindings/cxx/eina_cxx/eina_logical.hh \ +bindings/cxx/eina_cxx/eina_optional.hh \ +bindings/cxx/eina_cxx/eina_pp.hh \ +bindings/cxx/eina_cxx/eina_ptrarray.hh \ +bindings/cxx/eina_cxx/eina_ptrlist.hh \ +bindings/cxx/eina_cxx/eina_range_types.hh \ +bindings/cxx/eina_cxx/eina_ref.hh \ +bindings/cxx/eina_cxx/eina_stringshare.hh \ +bindings/cxx/eina_cxx/eina_string_view.hh \ +bindings/cxx/eina_cxx/eina_thread.hh \ +bindings/cxx/eina_cxx/eina_throw.hh \ +bindings/cxx/eina_cxx/eina_tuple.hh \ +bindings/cxx/eina_cxx/eina_tuple_c.hh \ +bindings/cxx/eina_cxx/eina_tuple_unwrap.hh \ +bindings/cxx/eina_cxx/eina_type_traits.hh \ +bindings/cxx/eina_cxx/eina_value.hh \ +bindings/cxx/eina_cxx/Eina.hh + +### Eio +installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/ +nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) lib/eio/Eio.hh + +lib/eio/Eio.hh: $(eio_eolian_cxx_hh) + @echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh + @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eio/Eio.hh + @for i in $(eio_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eio/Eio.hh; done + @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eio/Eio.hh + +CLEANFILES += $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) lib/eio/Eio.hh + +### Tests + +if EFL_ENABLE_TESTS + +### Tests for Eina +check_PROGRAMS += tests/eina_cxx/eina_cxx_suite +TESTS += tests/eina_cxx/eina_cxx_suite + +tests_eina_cxx_eina_cxx_suite_SOURCES = \ +tests/eina_cxx/eina_cxx_suite.cc \ +tests/eina_cxx/eina_cxx_test_inlist.cc \ +tests/eina_cxx/eina_cxx_test_log.cc \ +tests/eina_cxx/eina_cxx_test_inarray.cc \ +tests/eina_cxx/eina_cxx_test_iterator.cc \ +tests/eina_cxx/eina_cxx_test_ptrarray.cc \ +tests/eina_cxx/eina_cxx_test_ptrlist.cc \ +tests/eina_cxx/eina_cxx_test_stringshare.cc \ +tests/eina_cxx/eina_cxx_test_error.cc \ +tests/eina_cxx/eina_cxx_test_accessor.cc \ +tests/eina_cxx/eina_cxx_test_thread.cc \ +tests/eina_cxx/eina_cxx_test_optional.cc \ +tests/eina_cxx/eina_cxx_test_value.cc \ +tests/eina_cxx/simple.c \ +tests/eina_cxx/eina_cxx_suite.h + +tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h +tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h +tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h +tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h + +tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/simple.eo.c tests/eina_cxx/simple.eo.h + +CLEANFILES += \ +tests/eina_cxx/simple.eo.c \ +tests/eina_cxx/simple.eo.h \ +tests/eina_cxx/simple.eo.hh \ +tests/eina_cxx/simple.eo.impl.hh + +tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +-DTESTS_WD=\"`pwd`\" \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \ +-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina_cxx\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \ +-I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/efl/interfaces \ +-I$(top_srcdir)/src/bin/eina_cxx \ +-I$(top_builddir)/src/tests/eina_cxx \ +@CHECK_CFLAGS@ \ +@EO_CFLAGS@ \ +@ECORE_CFLAGS@ \ +@EO_CXX_CFLAGS@ \ +@EINA_CXX_CFLAGS@ +tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@ +tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ + +EXTRA_DIST += \ +tests/eina_cxx/simple.eo + +### Tests for ecore + +check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test +TESTS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test + +tests_ecore_cxx_ecore_cxx_suite_SOURCES = \ +tests/ecore_cxx/ecore_cxx_suite.cc \ +tests/ecore_cxx/ecore_cxx_test_safe_call.cc \ +tests/ecore_cxx/ecore_cxx_suite.h + +tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \ +-I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/efl/interfaces \ +-I$(top_builddir)/src/lib/ecore \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \ +@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EINA_CFLAGS@ \ +@ECORE_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ + +tests_ecore_cxx_ecore_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ +tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ + +tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc +tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/efl/interfaces \ +-I$(top_builddir)/src/lib/ecore \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \ +@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \ +@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ + +tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ +tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ + +### Tests for Eet +check_PROGRAMS += tests/eet_cxx/eet_cxx_suite +TESTS += tests/eet_cxx/eet_cxx_suite + +tests_eet_cxx_eet_cxx_suite_SOURCES = \ +tests/eet_cxx/eet_cxx_suite.cc \ +tests/eet_cxx/eet_cxx_test_descriptors.cc \ +tests/eet_cxx/eet_cxx_suite.h + +tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \ +-I$(top_builddir)/src/lib/efl \ +-DTESTS_WD=\"`pwd`\" \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \ +-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eet_cxx\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \ +@EO_CFLAGS@ @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@ +tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@ +tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@ + +### Tests for eldbus +check_PROGRAMS += tests/eldbus_cxx/eldbus_cxx_suite +TESTS += tests/eldbus_cxx/eldbus_cxx_suite + +tests_eldbus_cxx_eldbus_cxx_suite_SOURCES = \ +tests/eldbus_cxx/eldbus_cxx_suite.cc \ +tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc \ +tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc \ +tests/eldbus_cxx/eldbus_cxx_suite.h + +tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \ +-I$(top_builddir)/src/bindings/cxx/eina_cxx \ +-I$(top_srcdir)/src/bindings/cxx/eina_cxx \ +-I$(top_builddir)/src/bindings/cxx/ecore_cxx \ +-I$(top_srcdir)/src/bindings/cxx/ecore_cxx \ +-I$(top_builddir)/src/bindings/cxx/eldbus_cxx \ +-I$(top_srcdir)/src/bindings/cxx/eldbus_cxx \ +-I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/efl/interfaces \ +-I$(top_builddir)/src/lib/ecore \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \ +@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \ +@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@ + +tests_eldbus_cxx_eldbus_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@ +tests_eldbus_cxx_eldbus_cxx_suite_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@ + +### Tests for Evas +check_PROGRAMS += tests/evas_cxx/cxx_compile_test +TESTS += tests/evas_cxx/cxx_compile_test + +tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc +tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ + -I$(top_builddir)/src/lib/efl/interfaces/ \ + -I$(top_builddir)/src/lib/evas/canvas/ \ + -I$(top_builddir)/src/lib/evas/include/ \ + -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \ + -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \ + @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \ + @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ +tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@ +tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ + +### Tests for Elementary +check_PROGRAMS += tests/elementary_cxx/cxx_compile_test +TESTS += tests/elementary_cxx/cxx_compile_test + +tests_elementary_cxx_cxx_compile_test_SOURCES = tests/elementary_cxx/cxx_compile_test.cc +tests_elementary_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/evas/canvas/ \ +-I$(top_builddir)/src/lib/efl/interfaces/ \ +-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \ +-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \ +@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \ +@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@ +tests_elementary_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@ +tests_elementary_cxx_cxx_compile_test_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ + +endif +endif diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index f419270137..f0ad37d793 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -286,3 +286,10 @@ CLEANFILES += $(generated_ecore_js_bindings) GENERATED_JS_BINDINGS += $(generated_ecore_js_bindings) endif + +if HAVE_CXX11 + +ecore_eolian_cxx_hh = $(ecore_eolian_files:%.eo=%.eo.hh) +ecore_eolian_cxx_impl = $(ecore_eolian_files:%.eo=%.eo.impl.hh) + +endif diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index 245ef9cdd9..2a3dfd8baf 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -111,4 +111,3 @@ GENERATED_JS_BINDINGS += $(generated_ecore_audio_js_bindings) endif endif - diff --git a/src/Makefile_Ecore_Audio_Cxx.am b/src/Makefile_Ecore_Audio_Cxx.am deleted file mode 100644 index e8833ba373..0000000000 --- a/src/Makefile_Ecore_Audio_Cxx.am +++ /dev/null @@ -1,52 +0,0 @@ -if HAVE_ECORE_AUDIO -if HAVE_CXX11 - -### Generated headers - -generated_ecore_audio_cxx_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.hh) -generated_ecore_audio_impl_cxx_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.impl.hh) - -lib/ecore_audio/Ecore_Audio.hh: $(generated_ecore_audio_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_AUDIO_HH\n#define EFL_CXX_ECORE_AUDIO_HH\n" > $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh - @for i in $(generated_ecore_audio_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh - -generated_ecore_audio_cxx_all = \ - $(generated_ecore_audio_cxx_bindings) \ - $(generated_ecore_audio_impl_cxx_bindings) \ - lib/ecore_audio/Ecore_Audio.hh - -CLEANFILES += $(generated_ecore_audio_cxx_all) - -installed_ecoreaudiocxxmainheadersdir = $(includedir)/ecore-audio-cxx-@VMAJ@ -nodist_installed_ecoreaudiocxxmainheaders_DATA = $(generated_ecore_audio_cxx_all) - -### Unit tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += tests/ecore_audio_cxx/cxx_compile_test -TESTS += tests/ecore_audio_cxx/cxx_compile_test - -tests_ecore_audio_cxx_cxx_compile_test_SOURCES = tests/ecore_audio_cxx/cxx_compile_test.cc -tests_ecore_audio_cxx_cxx_compile_test_CPPFLAGS = \ --I$(top_builddir)/src/lib/efl \ --I$(top_srcdir)/src/lib/efl \ --I$(builddir)/src/lib/efl \ --I$(srcdir)/src/lib/efl \ --I$(top_builddir)/src/lib/evas/canvas/ \ --DTESTS_WD=\"`pwd`\" \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_audio_cxx\" \ --DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ecore_audio_cxx\" \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_audio_cxx\" \ -@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @ECORE_AUDIO_CFLAGS@ \ -@ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_AUDIO_CXX_CFLAGS@ - -tests_ecore_audio_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ -tests_ecore_audio_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ - -endif - -endif -endif diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am deleted file mode 100644 index ef97d5f424..0000000000 --- a/src/Makefile_Ecore_Cxx.am +++ /dev/null @@ -1,66 +0,0 @@ - -### Library - -if HAVE_CXX11 - -installed_ecorecxxmainheadersdir = $(includedir)/ecore-cxx-@VMAJ@ -dist_installed_ecorecxxmainheaders_DATA = bindings/ecore_cxx/Ecore.hh - -generated_ecore_cxx_bindings = $(ecore_eolian_files:%.eo=%.eo.hh) -generated_ecore_cxx_impl_bindings = $(ecore_eolian_files:%.eo=%.eo.impl.hh) - -lib/ecore/Ecore.eo.hh: $(generated_ecore_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_HH\n#define EFL_CXX_ECORE_HH\n" > $(top_builddir)/src/lib/ecore/Ecore.eo.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh - @for i in $(generated_ecore_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh - -generated_ecore_cxx_all = \ - $(generated_ecore_cxx_bindings) \ - $(generated_ecore_cxx_impl_bindings) \ - lib/ecore/Ecore.eo.hh - -CLEANFILES += $(generated_ecore_cxx_all) - -installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ -nodist_installed_ecorecxxheaders_DATA = $(generated_ecore_cxx_all) - -### Unit tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test -TESTS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test - -tests_ecore_cxx_ecore_cxx_suite_SOURCES = \ -tests/ecore_cxx/ecore_cxx_suite.cc \ -tests/ecore_cxx/ecore_cxx_test_safe_call.cc \ -tests/ecore_cxx/ecore_cxx_suite.h - -tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \ --I$(top_builddir)/src/lib/efl \ --I$(top_builddir)/src/lib/efl/interfaces \ --I$(top_builddir)/src/lib/ecore \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \ -@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EINA_CFLAGS@ \ -@ECORE_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ - -tests_ecore_cxx_ecore_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ -tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ - -tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc -tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/efl/interfaces/ \ --I$(top_builddir)/src/lib/evas/canvas/ \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \ -@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \ -@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ - -tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ -tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ - -endif -endif diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index c3f96e42a6..45934d6467 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -345,3 +345,8 @@ CLEANFILES += $(generated_edje_js_bindings) GENERATED_JS_BINDINGS += $(generated_edje_js_bindings) endif + +if HAVE_CXX11 +edje_eolian_cxx_hh = $(edje_eolian_files:%.eo=%.eo.hh) +edje_eolian_cxx_impl = $(edje_eolian_files:%.eo=%.eo.impl.hh) +endif diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am deleted file mode 100644 index 93ae9abcef..0000000000 --- a/src/Makefile_Edje_Cxx.am +++ /dev/null @@ -1,44 +0,0 @@ - -if HAVE_CXX11 - -### Generated headers -generated_edje_cxx_bindings = $(edje_eolian_files:%.eo=%.eo.hh) -generated_edje_cxx_impl_bindings = $(edje_eolian_files:%.eo=%.eo.impl.hh) - -lib/edje/Edje.hh: $(generated_edje_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/edje/Edje.hh - @for i in $(generated_edje_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh - -generated_edje_cxx_all = \ - $(generated_edje_cxx_bindings) \ - $(generated_edje_cxx_impl_bindings) \ - lib/edje/Edje.hh - -CLEANFILES += $(generated_edje_cxx_all) - -installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ -nodist_installed_edjecxxmainheaders_DATA = $(generated_edje_cxx_all) - -### Unit tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += tests/edje_cxx/cxx_compile_test -TESTS += tests/edje_cxx/cxx_compile_test - -tests_edje_cxx_cxx_compile_test_SOURCES = tests/edje_cxx/cxx_compile_test.cc -tests_edje_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ --I$(top_builddir)/src/lib/evas/canvas/ \ --I$(top_builddir)/src/lib/efl/interfaces/ \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje_cxx\" \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje_cxx\" \ -@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EDJE_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \ -@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EDJE_CFLAGS@ @EO_CFLAGS@ -tests_edje_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@ -tests_edje_cxx_cxx_compile_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ - -endif - -endif diff --git a/src/Makefile_Eet_Cxx.am b/src/Makefile_Eet_Cxx.am deleted file mode 100644 index 681e7bd5cd..0000000000 --- a/src/Makefile_Eet_Cxx.am +++ /dev/null @@ -1,35 +0,0 @@ - -### Library - -if HAVE_CXX11 -installed_eetcxxmainheadersdir = $(includedir)/eet-cxx-@VMAJ@ -dist_installed_eetcxxmainheaders_DATA = bindings/eet_cxx/Eet.hh - -installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@/eet-cxx -dist_installed_eetcxxheaders_DATA = \ -bindings/eet_cxx/eet_composite.hh \ -bindings/eet_cxx/eet_register.hh \ -bindings/eet_cxx/eet_type.hh - -### Unit tests - -if EFL_ENABLE_TESTS -check_PROGRAMS += tests/eet_cxx/eet_cxx_suite -TESTS += tests/eet_cxx/eet_cxx_suite - -tests_eet_cxx_eet_cxx_suite_SOURCES = \ -tests/eet_cxx/eet_cxx_suite.cc \ -tests/eet_cxx/eet_cxx_test_descriptors.cc \ -tests/eet_cxx/eet_cxx_suite.h - -tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \ --I$(top_builddir)/src/lib/efl \ --DTESTS_WD=\"`pwd`\" \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \ --DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eet_cxx\" \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \ -@EO_CFLAGS@ @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@ -tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@ -tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@ -endif -endif diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 8f40e93cb5..e3b3248aab 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -117,7 +117,11 @@ generated_efl_js_bindings = $(efl_eolian_files:%.eo=%.eo.js.cc) CLEANFILES += $(generated_efl_js_bindings) GENERATED_JS_BINDINGS += $(generated_efl_js_bindings) +endif +if HAVE_CXX11 +efl_eolian_cxx_hh = $(efl_eolian_files:%.eo=%.eo.hh) +efl_eolian_cxx_impl = $(efl_eolian_files:%.eo=%.eo.impl.hh) endif ### Binary diff --git a/src/Makefile_Efl_Cxx.am b/src/Makefile_Efl_Cxx.am deleted file mode 100644 index 91e02915e3..0000000000 --- a/src/Makefile_Efl_Cxx.am +++ /dev/null @@ -1,24 +0,0 @@ -if HAVE_CXX11 - -### Generated headers - -generated_efl_cxx_bindings = $(efl_eolian_files:%.eo=%.eo.hh) -generated_efl_cxx_impl_bindings = $(efl_eolian_files:%.eo=%.eo.impl.hh) - -lib/efl/Efl.hh: $(generated_efl_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/efl/Efl.hh - @for i in $(generated_efl_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh - -generated_efl_cxx_all = \ - $(generated_efl_cxx_bindings) \ - $(generated_efl_cxx_impl_bindings) \ - lib/efl/Efl.hh - -CLEANFILES += $(generated_efl_cxx_all) - -installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/ -nodist_installed_eflcxxmainheaders_DATA = $(generated_efl_cxx_all) - -endif diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am deleted file mode 100644 index 58c8afd7a5..0000000000 --- a/src/Makefile_Eina_Cxx.am +++ /dev/null @@ -1,101 +0,0 @@ - -### Library - -if HAVE_CXX11 -installed_einacxxmainheadersdir = $(includedir)/eina-cxx-@VMAJ@ -dist_installed_einacxxmainheaders_DATA = \ -bindings/eina_cxx/Eina.hh - -installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@/eina-cxx -dist_installed_einacxxheaders_DATA = \ -bindings/eina_cxx/eina_accessor.hh \ -bindings/eina_cxx/eina_array.hh \ -bindings/eina_cxx/eina_clone_allocators.hh \ -bindings/eina_cxx/eina_error.hh \ -bindings/eina_cxx/eina_eo_concrete_fwd.hh \ -bindings/eina_cxx/eina_fold.hh \ -bindings/eina_cxx/eina_function.hh \ -bindings/eina_cxx/eina_inarray.hh \ -bindings/eina_cxx/eina_inlist.hh \ -bindings/eina_cxx/eina_integer_sequence.hh \ -bindings/eina_cxx/eina_iterator.hh \ -bindings/eina_cxx/eina_lists_auxiliary.hh \ -bindings/eina_cxx/eina_list.hh \ -bindings/eina_cxx/eina_log.hh \ -bindings/eina_cxx/eina_logical.hh \ -bindings/eina_cxx/eina_optional.hh \ -bindings/eina_cxx/eina_pp.hh \ -bindings/eina_cxx/eina_ptrarray.hh \ -bindings/eina_cxx/eina_ptrlist.hh \ -bindings/eina_cxx/eina_range_types.hh \ -bindings/eina_cxx/eina_ref.hh \ -bindings/eina_cxx/eina_stringshare.hh \ -bindings/eina_cxx/eina_string_view.hh \ -bindings/eina_cxx/eina_thread.hh \ -bindings/eina_cxx/eina_throw.hh \ -bindings/eina_cxx/eina_tuple.hh \ -bindings/eina_cxx/eina_tuple_c.hh \ -bindings/eina_cxx/eina_tuple_unwrap.hh \ -bindings/eina_cxx/eina_type_traits.hh \ -bindings/eina_cxx/eina_value.hh - -### Unit tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += tests/eina_cxx/eina_cxx_suite -TESTS += tests/eina_cxx/eina_cxx_suite - -tests_eina_cxx_eina_cxx_suite_SOURCES = \ -tests/eina_cxx/eina_cxx_suite.cc \ -tests/eina_cxx/eina_cxx_test_inlist.cc \ -tests/eina_cxx/eina_cxx_test_log.cc \ -tests/eina_cxx/eina_cxx_test_inarray.cc \ -tests/eina_cxx/eina_cxx_test_iterator.cc \ -tests/eina_cxx/eina_cxx_test_ptrarray.cc \ -tests/eina_cxx/eina_cxx_test_ptrlist.cc \ -tests/eina_cxx/eina_cxx_test_stringshare.cc \ -tests/eina_cxx/eina_cxx_test_error.cc \ -tests/eina_cxx/eina_cxx_test_accessor.cc \ -tests/eina_cxx/eina_cxx_test_thread.cc \ -tests/eina_cxx/eina_cxx_test_optional.cc \ -tests/eina_cxx/eina_cxx_test_value.cc \ -tests/eina_cxx/simple.c \ -tests/eina_cxx/eina_cxx_suite.h - -tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h -tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h -tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h -tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h - -tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/simple.eo.c tests/eina_cxx/simple.eo.h - -CLEANFILES += \ -tests/eina_cxx/simple.eo.c \ -tests/eina_cxx/simple.eo.h \ -tests/eina_cxx/simple.eo.hh \ -tests/eina_cxx/simple.eo.impl.hh - -tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ --DTESTS_WD=\"`pwd`\" \ --DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \ --DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina_cxx\" \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \ --I$(top_builddir)/src/lib/efl \ --I$(top_builddir)/src/lib/efl/interfaces \ --I$(top_srcdir)/src/bin/eina_cxx \ --I$(top_builddir)/src/tests/eina_cxx \ -@CHECK_CFLAGS@ \ -@EO_CFLAGS@ \ -@ECORE_CFLAGS@ \ -@EO_CXX_CFLAGS@ \ -@EINA_CXX_CFLAGS@ -tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@ -tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ - -endif - -EXTRA_DIST += \ -tests/eina_cxx/simple.eo - -endif diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am index 6a95841150..64b7972e81 100644 --- a/src/Makefile_Eio.am +++ b/src/Makefile_Eio.am @@ -1,16 +1,16 @@ ### Library -EIO_EOS = \ +eio_eolian_files = \ lib/eio/eio_model.eo -EIO_EOS_H = $(EIO_EOS:%.eo=%.eo.h) -EIO_EOS_C = $(EIO_EOS:%.eo=%.eo.c) +eio_eolian_h = $(eio_eolian_files:%.eo=%.eo.h) +eio_eolian_c = $(eio_eolian_files:%.eo=%.eo.c) -BUILT_SOURCES += $(EIO_EOS_C) $(EIO_EOS_H) +BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h) eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@ -eioeolianfiles_DATA = $(EIO_EOS) +eioeolianfiles_DATA = $(eio_eolian_files) lib_LTLIBRARIES += lib/eio/libeio.la EXTRA_DIST += \ @@ -21,7 +21,7 @@ lib/eio/Makefile.in installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@ dist_installed_eiomainheaders_DATA = lib/eio/Eio.h lib/eio/eio_inline_helper.x -nodist_installed_eiomainheaders_DATA = $(EIO_EOS_H) +nodist_installed_eiomainheaders_DATA = $(eio_eoolian_h) lib_eio_libeio_la_SOURCES = \ lib/eio/eio_dir.c \ @@ -62,6 +62,13 @@ if HAVE_NOTIFY_COCOA lib_eio_libeio_la_LDFLAGS += -framework CoreServices endif +if HAVE_CXX11 + +eio_eolian_cxx_hh = $(eio_eolian_files:%.eo=%.eo.hh) +eio_eolian_cxx_impl = $(eio_eolian_files:%.eo=%.eo.impl.hh) + +endif + if EFL_ENABLE_TESTS check_PROGRAMS += tests/eio/eio_suite diff --git a/src/Makefile_Eio_Cxx.am b/src/Makefile_Eio_Cxx.am deleted file mode 100644 index b6aeaa0ebf..0000000000 --- a/src/Makefile_Eio_Cxx.am +++ /dev/null @@ -1,23 +0,0 @@ -if HAVE_CXX11 - -### Generated headers -generated_eio_cxx_bindings = $(EIO_EOS:%.eo=%.eo.hh) -generated_eio_cxx_impl_bindings = $(EIO_EOS:%.eo=%.eo.impl.hh) - -lib/eio/Eio.hh: $(generated_eio_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eio/Eio.hh - @for i in $(generated_eio_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eio/Eio.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eio/Eio.hh - -generated_eio_cxx_all = \ - $(generated_eio_cxx_bindings) \ - $(generated_eio_cxx_impl_bindings) \ - lib/eio/Eio.hh - -CLEANFILES += $(generated_eio_cxx_all) - -installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/ -nodist_installed_eiocxxmainheaders_DATA = $(generated_eio_cxx_all) - -endif diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am index 194bdb07c8..7a5cc86071 100644 --- a/src/Makefile_Eldbus.am +++ b/src/Makefile_Eldbus.am @@ -112,6 +112,11 @@ bin_eldbus_eldbus_codegen_LDADD = @USE_ELDBUS_LIBS@ endif bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@ +if HAVE_CXX11 +eldbus_eolian_cxx_hh = $(eldbus_eolian_files:%.eo=%.eo.hh) +eldbus_eolian_cxx_impl = $(eldbus_eolian_files:%.eo=%.eo.impl.hh) +endif + ### Unit tests if EFL_ENABLE_TESTS diff --git a/src/Makefile_Eldbus_Cxx.am b/src/Makefile_Eldbus_Cxx.am deleted file mode 100644 index 8f9b2cde64..0000000000 --- a/src/Makefile_Eldbus_Cxx.am +++ /dev/null @@ -1,73 +0,0 @@ - -if HAVE_CXX11 - -### Generated headers - -generated_eldbus_cxx_bindings = $(eldbus_eolian_files:%.eo=%.eo.hh) -generated_eldbus_cxx_impl_bindings = $(eldbus_eolian_files:%.eo=%.eo.impl.hh) - -lib/eldbus/Eldbus_Model.hh: $(generated_eldbus_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_ELDBUS_MODEL_HH\n#define EFL_CXX_ELDBUS_MODEL_HH\n" > $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh - @echo @ECHO_E@ "#include " >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh - @for i in $(generated_eldbus_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh - -generated_eldbus_cxx_all = \ - $(generated_eldbus_cxx_bindings) \ - $(generated_eldbus_cxx_impl_bindings) \ - lib/eldbus/Eldbus_Model.hh - -CLEANFILES += $(generated_eldbus_cxx_all) - -nodist_installed_eldbuscxxmainheaders_DATA = $(generated_eldbus_cxx_all) - -### Library - -installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ -dist_installed_eldbuscxxmainheaders_DATA = \ -bindings/eldbus_cxx/eldbus_basic.hh \ -bindings/eldbus_cxx/eldbus_error.hh \ -bindings/eldbus_cxx/eldbus_freedesktop.hh \ -bindings/eldbus_cxx/Eldbus.hh \ -bindings/eldbus_cxx/eldbus_integer_sequence.hh \ -bindings/eldbus_cxx/eldbus_message_arguments.hh \ -bindings/eldbus_cxx/eldbus_message.hh \ -bindings/eldbus_cxx/eldbus_proxy_call.hh \ -bindings/eldbus_cxx/eldbus_raw_tuple.hh \ -bindings/eldbus_cxx/eldbus_service.hh \ -bindings/eldbus_cxx/eldbus_signature_traits.hh - -### Unit tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += tests/eldbus_cxx/eldbus_cxx_suite -TESTS += tests/eldbus_cxx/eldbus_cxx_suite - -tests_eldbus_cxx_eldbus_cxx_suite_SOURCES = \ -tests/eldbus_cxx/eldbus_cxx_suite.cc \ -tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc \ -tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc \ -tests/eldbus_cxx/eldbus_cxx_suite.h - -tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \ --I$(top_builddir)/src/bindings/eina_cxx \ --I$(top_srcdir)/src/bindings/eina_cxx \ --I$(top_builddir)/src/bindings/ecore_cxx \ --I$(top_srcdir)/src/bindings/ecore_cxx \ --I$(top_builddir)/src/bindings/eldbus_cxx \ --I$(top_srcdir)/src/bindings/eldbus_cxx \ --I$(top_builddir)/src/lib/efl \ --I$(top_builddir)/src/lib/efl/interfaces \ --I$(top_builddir)/src/lib/ecore \ --DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \ -@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \ -@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@ - -tests_eldbus_cxx_eldbus_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@ -tests_eldbus_cxx_eldbus_cxx_suite_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@ - -endif - -endif diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 3d9a15f82a..c5f8e6fa5a 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -1312,6 +1312,11 @@ GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings) endif +if HAVE_CXX11 +elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh) +elementary_eolian_cxx_impl = $(elm_public_eolian_files:%.eo=%.eo.impl.hh) +endif + EXTRA_DIST += \ tests/elementary/elm_suite.h \ tests/elementary/elm_test_helper.h \ diff --git a/src/Makefile_Elementary_Cxx.am b/src/Makefile_Elementary_Cxx.am deleted file mode 100644 index d88795cf4b..0000000000 --- a/src/Makefile_Elementary_Cxx.am +++ /dev/null @@ -1,54 +0,0 @@ -if HAVE_CXX11 - - -### Generated headers -generated_elementary_cxx_bindings = $(elm_eolian_files:%.eo=%.eo.hh) -generated_elementary_cxx_impl_bindings = $(elm_eolian_files:%.eo=%.eo.impl.hh) - -lib/elementary/Elementary.hh: $(generated_elementary_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_ELEMENTARY_HH\n#define EFL_CXX_ELEMENTARY_HH\n" > $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H)" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "#error Do not include Elm C API headers before including Elementary.hh" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "#endif" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "extern \"C\" {" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "#include \"Elementary.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "#include \"elm_widget.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "}" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/elementary/Elementary.hh - @for i in $(generated_elementary_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/elementary/Elementary.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh - -generated_elementary_cxx_all = \ - $(generated_elementary_cxx_bindings) \ - $(generated_elementary_cxx_impl_bindings) \ - lib/elementary/Elementary.hh - -CLEANFILES += $(generated_elementary_cxx_all) - -installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/ -nodist_installed_elementarycxxmainheaders_DATA = $(generated_elementary_cxx_all) - -### Unit tests -### To be reenable in the future when we do have a meaningful tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += -TESTS += - -# tests_elementary_cxx_cxx_compile_test_SOURCES = tests/elementary_cxx/cxx_compile_test.cc -# tests_elementary_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -# -I$(top_builddir)/src/lib/evas/canvas/ \ -# -I$(top_builddir)/src/lib/efl/interfaces/ \ -# -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \ -# -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \ -# @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \ -# @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@ -# tests_elementary_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@ -# tests_elementary_cxx_cxx_compile_test_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ - -endif - -endif diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index 6cf0b3acd4..c61822c9a7 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -225,3 +225,10 @@ CLEANFILES += $(generated_eo_js_bindings) GENERATED_JS_BINDINGS += $(generated_eo_js_bindings) endif + +if HAVE_CXX11 + +eo_eolian_cxx_hh = $(eo_eolian_files:%.eo=%.eo.hh) +eo_eolian_cxx_impl_hh = $(eo_eolian_files:%.eo=%.eo.impl.hh) + +endif diff --git a/src/Makefile_Eo_Cxx.am b/src/Makefile_Eo_Cxx.am deleted file mode 100644 index 8153058e96..0000000000 --- a/src/Makefile_Eo_Cxx.am +++ /dev/null @@ -1,34 +0,0 @@ - -### Generated Headers - -generated_eo_cxx_bindings = \ -lib/eo/eo_base.eo.hh \ -lib/eo/eo_base.eo.impl.hh \ -lib/eo/eo_class.eo.hh \ -lib/eo/eo_class.eo.impl.hh - -### Library - -if HAVE_CXX11 - -CLEANFILES += $(generated_eo_cxx_bindings) - -nodist_installed_eocxxheaders_DATA = $(generated_eo_cxx_bindings) - -installed_eocxxmainheadersdir = $(includedir)/eo-cxx-@VMAJ@/ -dist_installed_eocxxmainheaders_DATA = \ -bindings/eo_cxx/Eo.hh - -installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/ -dist_installed_eocxxheaders_DATA = \ -bindings/eo_cxx/eo_concrete.hh \ -bindings/eo_cxx/eo_event.hh \ -bindings/eo_cxx/eo_init.hh \ -bindings/eo_cxx/eo_wref.hh \ -bindings/eo_cxx/eo_inherit.hh \ -bindings/eo_cxx/eo_ops.hh \ -bindings/eo_cxx/eo_private.hh \ -bindings/eo_cxx/eo_inherit_bindings.hh \ -bindings/eo_cxx/eo_cxx_interop.hh - -endif diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am index 2e08a8494c..98aa5e3022 100644 --- a/src/Makefile_Eolian_Cxx.am +++ b/src/Makefile_Eolian_Cxx.am @@ -45,6 +45,7 @@ bin_eolian_cxx_eolian_cxx_SOURCES = \ bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/eolian_cxx/ \ @CHECK_CFLAGS@ @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CFLAGS@ \ +-I$(top_srcdir)/src/bindings/cxx/eina_cxx \ @EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@ bin_eolian_cxx_eolian_cxx_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 10df07e3e3..daa11b8a86 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2375,3 +2375,8 @@ CLEANFILES += $(generated_evas_js_bindings) GENERATED_JS_BINDINGS += $(generated_evas_js_bindings) endif + +if HAVE_CXX11 +evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh) +evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) +endif diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am deleted file mode 100644 index 40caceed2f..0000000000 --- a/src/Makefile_Evas_Cxx.am +++ /dev/null @@ -1,48 +0,0 @@ - -if HAVE_CXX11 - -### Generated headers - -generated_evas_canvas_cxx_bindings = $(evas_eolian_pub_files:%.eo=%.eo.hh) -generated_evas_canvas_cxx_impl_bindings = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) - -lib/evas/Evas.hh: $(generated_evas_canvas_cxx_bindings) - @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh - @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/evas/Evas.hh - @for i in $(generated_evas_canvas_cxx_bindings); do echo "#include " >> $(top_builddir)/src/lib/evas/Evas.hh; done - @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh - -generated_evas_canvas_cxx_all = \ - $(generated_evas_canvas_cxx_bindings) \ - $(generated_evas_canvas_cxx_impl_bindings) \ - lib/evas/Evas.hh - -CLEANFILES += $(generated_evas_canvas_cxx_all) - -installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ -nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh - -installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas -nodist_installed_evascxxcanvasheaders_DATA = $(generated_evas_canvas_cxx_all) - -### Unit tests - -if EFL_ENABLE_TESTS - -check_PROGRAMS += tests/evas_cxx/cxx_compile_test -TESTS += tests/evas_cxx/cxx_compile_test - -tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc -tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ - -I$(top_builddir)/src/lib/efl/interfaces/ \ - -I$(top_builddir)/src/lib/evas/canvas/ \ - -I$(top_builddir)/src/lib/evas/include/ \ - -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \ - -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \ - @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \ - @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ -tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@ -tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ - -endif -endif diff --git a/src/bin/eolian_cxx/type_lookup_table.cc b/src/bin/eolian_cxx/type_lookup_table.cc index de6529969e..55a8e6968a 100644 --- a/src/bin/eolian_cxx/type_lookup_table.cc +++ b/src/bin/eolian_cxx/type_lookup_table.cc @@ -13,22 +13,22 @@ type_lookup_table {"Ecore_Task_Cb", eolian_type::callback_, {"Ecore.h"}}, {"Ecore_Timeline_Cb", eolian_type::callback_, {"Ecore.h"}}, {"Edje_Signal_Cb", eolian_type::callback_, {"Edje.h"}}, - {"Eina_Accessor *", eolian_type::complex_, false, false, true, false, "::efl::eina::accessor", {"eina-cxx/eina_accessor.hh"}}, + {"Eina_Accessor *", eolian_type::complex_, false, false, true, false, "::efl::eina::accessor", {"eina_accessor.hh"}}, {"Eina_Bool", eolian_type::simple_, false, false, false, false, "bool", {}}, {"Eina_Bool *", eolian_type::simple_, false, false, false, false, "bool*", {}}, - {"Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina-cxx/eina_inlist.hh"}}, - {"Eina_Inlist *", eolian_type::complex_, false, true, true, true, "::efl::eina::inlist", {"eina-cxx/eina_inlist.hh"}}, - {"Eina_Iterator *", eolian_type::complex_, false, false, true, true, "::efl::eina::iterator", {"eina-cxx/eina_iterator.hh"}}, - {"Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina-cxx/eina_list.hh"}}, - {"Eina_List *", eolian_type::complex_, false, true, true, true, "::efl::eina::list", {"eina-cxx/eina_list.hh"}}, - {"const Eina_List *", eolian_type::complex_, true, false, true, true, "::efl::eina::crange_list", {"eina-cxx/eina_list.hh"}}, + {"Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina_inlist.hh"}}, + {"Eina_Inlist *", eolian_type::complex_, false, true, true, true, "::efl::eina::inlist", {"eina_inlist.hh"}}, + {"Eina_Iterator *", eolian_type::complex_, false, false, true, true, "::efl::eina::iterator", {"eina_iterator.hh"}}, + {"Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina_list.hh"}}, + {"Eina_List *", eolian_type::complex_, false, true, true, true, "::efl::eina::list", {"eina_list.hh"}}, + {"const Eina_List *", eolian_type::complex_, true, false, true, true, "::efl::eina::crange_list", {"eina_list.hh"}}, {"Eio_Filter_Direct_Cb", eolian_type::callback_, {"Eio.h"}}, {"Eo *", eolian_type::simple_, false, true, true, false, "::efl::eo::concrete", {"eo_concrete.hh"}}, {"Eo *", eolian_type::simple_, false, false, true, false, "::efl::eo::concrete", {"eo_concrete.hh"}}, //{"Evas_Object_Box_Layout", eolian_type::callback_, {"Evas.h"}}, //{"char *", eolian_type::simple_, false, true, true, false, "std::unique_ptr", {"memory"}}, - {"const Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina-cxx/eina_inlist.hh"}}, - {"const Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina-cxx/eina_ptrlist.hh"}}, + {"const Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina_inlist.hh"}}, + {"const Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina_ptrlist.hh"}}, {"const char *", eolian_type::simple_, false, false, true, true, "::efl::eina::string_view", {"string"}}, }; diff --git a/src/bindings/ecore_cxx/Ecore.hh b/src/bindings/cxx/ecore_cxx/Ecore.hh similarity index 100% rename from src/bindings/ecore_cxx/Ecore.hh rename to src/bindings/cxx/ecore_cxx/Ecore.hh diff --git a/src/bindings/eet_cxx/Eet.hh b/src/bindings/cxx/eet_cxx/Eet.hh similarity index 100% rename from src/bindings/eet_cxx/Eet.hh rename to src/bindings/cxx/eet_cxx/Eet.hh diff --git a/src/bindings/eet_cxx/eet_composite.hh b/src/bindings/cxx/eet_cxx/eet_composite.hh similarity index 100% rename from src/bindings/eet_cxx/eet_composite.hh rename to src/bindings/cxx/eet_cxx/eet_composite.hh diff --git a/src/bindings/eet_cxx/eet_register.hh b/src/bindings/cxx/eet_cxx/eet_register.hh similarity index 100% rename from src/bindings/eet_cxx/eet_register.hh rename to src/bindings/cxx/eet_cxx/eet_register.hh diff --git a/src/bindings/eet_cxx/eet_type.hh b/src/bindings/cxx/eet_cxx/eet_type.hh similarity index 100% rename from src/bindings/eet_cxx/eet_type.hh rename to src/bindings/cxx/eet_cxx/eet_type.hh diff --git a/src/bindings/eina_cxx/Eina.hh b/src/bindings/cxx/eina_cxx/Eina.hh similarity index 100% rename from src/bindings/eina_cxx/Eina.hh rename to src/bindings/cxx/eina_cxx/Eina.hh diff --git a/src/bindings/eina_cxx/eina_accessor.hh b/src/bindings/cxx/eina_cxx/eina_accessor.hh similarity index 100% rename from src/bindings/eina_cxx/eina_accessor.hh rename to src/bindings/cxx/eina_cxx/eina_accessor.hh diff --git a/src/bindings/eina_cxx/eina_array.hh b/src/bindings/cxx/eina_cxx/eina_array.hh similarity index 100% rename from src/bindings/eina_cxx/eina_array.hh rename to src/bindings/cxx/eina_cxx/eina_array.hh diff --git a/src/bindings/eina_cxx/eina_clone_allocators.hh b/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh similarity index 100% rename from src/bindings/eina_cxx/eina_clone_allocators.hh rename to src/bindings/cxx/eina_cxx/eina_clone_allocators.hh diff --git a/src/bindings/eina_cxx/eina_eo_concrete_fwd.hh b/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh similarity index 100% rename from src/bindings/eina_cxx/eina_eo_concrete_fwd.hh rename to src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh diff --git a/src/bindings/eina_cxx/eina_error.hh b/src/bindings/cxx/eina_cxx/eina_error.hh similarity index 100% rename from src/bindings/eina_cxx/eina_error.hh rename to src/bindings/cxx/eina_cxx/eina_error.hh diff --git a/src/bindings/eina_cxx/eina_fold.hh b/src/bindings/cxx/eina_cxx/eina_fold.hh similarity index 100% rename from src/bindings/eina_cxx/eina_fold.hh rename to src/bindings/cxx/eina_cxx/eina_fold.hh diff --git a/src/bindings/eina_cxx/eina_function.hh b/src/bindings/cxx/eina_cxx/eina_function.hh similarity index 100% rename from src/bindings/eina_cxx/eina_function.hh rename to src/bindings/cxx/eina_cxx/eina_function.hh diff --git a/src/bindings/eina_cxx/eina_inarray.hh b/src/bindings/cxx/eina_cxx/eina_inarray.hh similarity index 100% rename from src/bindings/eina_cxx/eina_inarray.hh rename to src/bindings/cxx/eina_cxx/eina_inarray.hh diff --git a/src/bindings/eina_cxx/eina_inlist.hh b/src/bindings/cxx/eina_cxx/eina_inlist.hh similarity index 100% rename from src/bindings/eina_cxx/eina_inlist.hh rename to src/bindings/cxx/eina_cxx/eina_inlist.hh diff --git a/src/bindings/eina_cxx/eina_integer_sequence.hh b/src/bindings/cxx/eina_cxx/eina_integer_sequence.hh similarity index 100% rename from src/bindings/eina_cxx/eina_integer_sequence.hh rename to src/bindings/cxx/eina_cxx/eina_integer_sequence.hh diff --git a/src/bindings/eina_cxx/eina_iterator.hh b/src/bindings/cxx/eina_cxx/eina_iterator.hh similarity index 100% rename from src/bindings/eina_cxx/eina_iterator.hh rename to src/bindings/cxx/eina_cxx/eina_iterator.hh diff --git a/src/bindings/eina_cxx/eina_list.hh b/src/bindings/cxx/eina_cxx/eina_list.hh similarity index 100% rename from src/bindings/eina_cxx/eina_list.hh rename to src/bindings/cxx/eina_cxx/eina_list.hh diff --git a/src/bindings/eina_cxx/eina_lists_auxiliary.hh b/src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh similarity index 100% rename from src/bindings/eina_cxx/eina_lists_auxiliary.hh rename to src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh diff --git a/src/bindings/eina_cxx/eina_log.hh b/src/bindings/cxx/eina_cxx/eina_log.hh similarity index 100% rename from src/bindings/eina_cxx/eina_log.hh rename to src/bindings/cxx/eina_cxx/eina_log.hh diff --git a/src/bindings/eina_cxx/eina_logical.hh b/src/bindings/cxx/eina_cxx/eina_logical.hh similarity index 100% rename from src/bindings/eina_cxx/eina_logical.hh rename to src/bindings/cxx/eina_cxx/eina_logical.hh diff --git a/src/bindings/eina_cxx/eina_optional.hh b/src/bindings/cxx/eina_cxx/eina_optional.hh similarity index 100% rename from src/bindings/eina_cxx/eina_optional.hh rename to src/bindings/cxx/eina_cxx/eina_optional.hh diff --git a/src/bindings/eina_cxx/eina_pp.hh b/src/bindings/cxx/eina_cxx/eina_pp.hh similarity index 100% rename from src/bindings/eina_cxx/eina_pp.hh rename to src/bindings/cxx/eina_cxx/eina_pp.hh diff --git a/src/bindings/eina_cxx/eina_ptrarray.hh b/src/bindings/cxx/eina_cxx/eina_ptrarray.hh similarity index 100% rename from src/bindings/eina_cxx/eina_ptrarray.hh rename to src/bindings/cxx/eina_cxx/eina_ptrarray.hh diff --git a/src/bindings/eina_cxx/eina_ptrlist.hh b/src/bindings/cxx/eina_cxx/eina_ptrlist.hh similarity index 100% rename from src/bindings/eina_cxx/eina_ptrlist.hh rename to src/bindings/cxx/eina_cxx/eina_ptrlist.hh diff --git a/src/bindings/eina_cxx/eina_range_types.hh b/src/bindings/cxx/eina_cxx/eina_range_types.hh similarity index 100% rename from src/bindings/eina_cxx/eina_range_types.hh rename to src/bindings/cxx/eina_cxx/eina_range_types.hh diff --git a/src/bindings/eina_cxx/eina_ref.hh b/src/bindings/cxx/eina_cxx/eina_ref.hh similarity index 100% rename from src/bindings/eina_cxx/eina_ref.hh rename to src/bindings/cxx/eina_cxx/eina_ref.hh diff --git a/src/bindings/eina_cxx/eina_string_view.hh b/src/bindings/cxx/eina_cxx/eina_string_view.hh similarity index 100% rename from src/bindings/eina_cxx/eina_string_view.hh rename to src/bindings/cxx/eina_cxx/eina_string_view.hh diff --git a/src/bindings/eina_cxx/eina_stringshare.hh b/src/bindings/cxx/eina_cxx/eina_stringshare.hh similarity index 100% rename from src/bindings/eina_cxx/eina_stringshare.hh rename to src/bindings/cxx/eina_cxx/eina_stringshare.hh diff --git a/src/bindings/eina_cxx/eina_thread.hh b/src/bindings/cxx/eina_cxx/eina_thread.hh similarity index 100% rename from src/bindings/eina_cxx/eina_thread.hh rename to src/bindings/cxx/eina_cxx/eina_thread.hh diff --git a/src/bindings/eina_cxx/eina_throw.hh b/src/bindings/cxx/eina_cxx/eina_throw.hh similarity index 100% rename from src/bindings/eina_cxx/eina_throw.hh rename to src/bindings/cxx/eina_cxx/eina_throw.hh diff --git a/src/bindings/eina_cxx/eina_tuple.hh b/src/bindings/cxx/eina_cxx/eina_tuple.hh similarity index 100% rename from src/bindings/eina_cxx/eina_tuple.hh rename to src/bindings/cxx/eina_cxx/eina_tuple.hh diff --git a/src/bindings/eina_cxx/eina_tuple_c.hh b/src/bindings/cxx/eina_cxx/eina_tuple_c.hh similarity index 100% rename from src/bindings/eina_cxx/eina_tuple_c.hh rename to src/bindings/cxx/eina_cxx/eina_tuple_c.hh diff --git a/src/bindings/eina_cxx/eina_tuple_unwrap.hh b/src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh similarity index 100% rename from src/bindings/eina_cxx/eina_tuple_unwrap.hh rename to src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh diff --git a/src/bindings/eina_cxx/eina_type_traits.hh b/src/bindings/cxx/eina_cxx/eina_type_traits.hh similarity index 100% rename from src/bindings/eina_cxx/eina_type_traits.hh rename to src/bindings/cxx/eina_cxx/eina_type_traits.hh diff --git a/src/bindings/eina_cxx/eina_value.hh b/src/bindings/cxx/eina_cxx/eina_value.hh similarity index 100% rename from src/bindings/eina_cxx/eina_value.hh rename to src/bindings/cxx/eina_cxx/eina_value.hh diff --git a/src/bindings/eldbus_cxx/Eldbus.hh b/src/bindings/cxx/eldbus_cxx/Eldbus.hh similarity index 100% rename from src/bindings/eldbus_cxx/Eldbus.hh rename to src/bindings/cxx/eldbus_cxx/Eldbus.hh diff --git a/src/bindings/eldbus_cxx/eldbus_basic.hh b/src/bindings/cxx/eldbus_cxx/eldbus_basic.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_basic.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_basic.hh diff --git a/src/bindings/eldbus_cxx/eldbus_error.hh b/src/bindings/cxx/eldbus_cxx/eldbus_error.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_error.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_error.hh diff --git a/src/bindings/eldbus_cxx/eldbus_freedesktop.hh b/src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_freedesktop.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh diff --git a/src/bindings/eldbus_cxx/eldbus_integer_sequence.hh b/src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_integer_sequence.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh diff --git a/src/bindings/eldbus_cxx/eldbus_message.hh b/src/bindings/cxx/eldbus_cxx/eldbus_message.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_message.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_message.hh diff --git a/src/bindings/eldbus_cxx/eldbus_message_arguments.hh b/src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_message_arguments.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh diff --git a/src/bindings/eldbus_cxx/eldbus_proxy_call.hh b/src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_proxy_call.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh diff --git a/src/bindings/eldbus_cxx/eldbus_raw_tuple.hh b/src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_raw_tuple.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh diff --git a/src/bindings/eldbus_cxx/eldbus_service.hh b/src/bindings/cxx/eldbus_cxx/eldbus_service.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_service.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_service.hh diff --git a/src/bindings/eldbus_cxx/eldbus_signature_traits.hh b/src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh similarity index 100% rename from src/bindings/eldbus_cxx/eldbus_signature_traits.hh rename to src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh diff --git a/src/bindings/eo_cxx/Eo.hh b/src/bindings/cxx/eo_cxx/Eo.hh similarity index 100% rename from src/bindings/eo_cxx/Eo.hh rename to src/bindings/cxx/eo_cxx/Eo.hh diff --git a/src/bindings/eo_cxx/eo_concrete.hh b/src/bindings/cxx/eo_cxx/eo_concrete.hh similarity index 100% rename from src/bindings/eo_cxx/eo_concrete.hh rename to src/bindings/cxx/eo_cxx/eo_concrete.hh diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh similarity index 100% rename from src/bindings/eo_cxx/eo_cxx_interop.hh rename to src/bindings/cxx/eo_cxx/eo_cxx_interop.hh diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/cxx/eo_cxx/eo_event.hh similarity index 100% rename from src/bindings/eo_cxx/eo_event.hh rename to src/bindings/cxx/eo_cxx/eo_event.hh diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/cxx/eo_cxx/eo_inherit.hh similarity index 100% rename from src/bindings/eo_cxx/eo_inherit.hh rename to src/bindings/cxx/eo_cxx/eo_inherit.hh diff --git a/src/bindings/eo_cxx/eo_inherit_bindings.hh b/src/bindings/cxx/eo_cxx/eo_inherit_bindings.hh similarity index 100% rename from src/bindings/eo_cxx/eo_inherit_bindings.hh rename to src/bindings/cxx/eo_cxx/eo_inherit_bindings.hh diff --git a/src/bindings/eo_cxx/eo_init.hh b/src/bindings/cxx/eo_cxx/eo_init.hh similarity index 100% rename from src/bindings/eo_cxx/eo_init.hh rename to src/bindings/cxx/eo_cxx/eo_init.hh diff --git a/src/bindings/eo_cxx/eo_ops.hh b/src/bindings/cxx/eo_cxx/eo_ops.hh similarity index 100% rename from src/bindings/eo_cxx/eo_ops.hh rename to src/bindings/cxx/eo_cxx/eo_ops.hh diff --git a/src/bindings/eo_cxx/eo_private.hh b/src/bindings/cxx/eo_cxx/eo_private.hh similarity index 100% rename from src/bindings/eo_cxx/eo_private.hh rename to src/bindings/cxx/eo_cxx/eo_private.hh diff --git a/src/bindings/eo_cxx/eo_wref.hh b/src/bindings/cxx/eo_cxx/eo_wref.hh similarity index 100% rename from src/bindings/eo_cxx/eo_wref.hh rename to src/bindings/cxx/eo_cxx/eo_wref.hh diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo index b2940f5a70..1a57191a0f 100644 --- a/src/lib/elementary/elm_image.eo +++ b/src/lib/elementary/elm_image.eo @@ -42,7 +42,7 @@ struct Elm.Image.Error } class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface, - Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, Efl.Player, + Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action, Edje.Object, Efl.Orientation, Efl.Flipable) { diff --git a/src/tests/elementary_cxx/cxx_compile_test.cc b/src/tests/elementary_cxx/cxx_compile_test.cc new file mode 100644 index 0000000000..0ff0f2af14 --- /dev/null +++ b/src/tests/elementary_cxx/cxx_compile_test.cc @@ -0,0 +1,14 @@ + +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "elementary_config.h" +#endif + +#include + +#include + +int main() +{ + return 0; +}