enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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.
This commit is contained in:
Felipe Magno de Almeida 2016-05-23 12:01:30 -03:00
parent 930f39b91b
commit e3c8b280c6
84 changed files with 429 additions and 583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4/efl.m4
View File

@ -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}"

12
src/Makefile.am
View File

@ -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

351
src/Makefile_Cxx.am Normal file
View File

@ -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 <canvas/$$(basename $$i)>" >> $(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 <Eldbus_Model.h>" >> $(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

7
src/Makefile_Ecore.am
View File

@ -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

1
src/Makefile_Ecore_Audio.am
View File

@ -111,4 +111,3 @@ GENERATED_JS_BINDINGS += $(generated_ecore_audio_js_bindings)
endif
endif

52
src/Makefile_Ecore_Audio_Cxx.am
View File

@ -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

66
src/Makefile_Ecore_Cxx.am
View File

@ -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

5
src/Makefile_Edje.am
View File

@ -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

44
src/Makefile_Edje_Cxx.am
View File

@ -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

35
src/Makefile_Eet_Cxx.am
View File

@ -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

4
src/Makefile_Efl.am
View File

@ -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

24
src/Makefile_Efl_Cxx.am
View File

@ -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

101
src/Makefile_Eina_Cxx.am
View File

@ -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

19
src/Makefile_Eio.am
View File

@ -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

23
src/Makefile_Eio_Cxx.am
View File

@ -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

5
src/Makefile_Eldbus.am
View File

@ -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

73
src/Makefile_Eldbus_Cxx.am
View File

@ -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 <Eldbus_Model.h>" >> $(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

5
src/Makefile_Elementary.am
View File

@ -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 \

54
src/Makefile_Elementary_Cxx.am
View File

@ -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

7
src/Makefile_Eo.am
View File

@ -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

34
src/Makefile_Eo_Cxx.am
View File

@ -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

1
src/Makefile_Eolian_Cxx.am
View File

@ -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@

5
src/Makefile_Evas.am
View File

@ -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

48
src/Makefile_Evas_Cxx.am
View File

@ -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 <canvas/$$(basename $$i)>" >> $(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

18
src/bin/eolian_cxx/type_lookup_table.cc
View File

@ -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<char*>", {"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"}},
};

0
src/bindings/ecore_cxx/Ecore.hh → src/bindings/cxx/ecore_cxx/Ecore.hh
View File

0
src/bindings/eet_cxx/Eet.hh → src/bindings/cxx/eet_cxx/Eet.hh
View File

0
src/bindings/eet_cxx/eet_composite.hh → src/bindings/cxx/eet_cxx/eet_composite.hh
View File

0
src/bindings/eet_cxx/eet_register.hh → src/bindings/cxx/eet_cxx/eet_register.hh
View File

0
src/bindings/eet_cxx/eet_type.hh → src/bindings/cxx/eet_cxx/eet_type.hh
View File

0
src/bindings/eina_cxx/Eina.hh → src/bindings/cxx/eina_cxx/Eina.hh
View File

0
src/bindings/eina_cxx/eina_accessor.hh → src/bindings/cxx/eina_cxx/eina_accessor.hh
View File

0
src/bindings/eina_cxx/eina_array.hh → src/bindings/cxx/eina_cxx/eina_array.hh
View File

0
src/bindings/eina_cxx/eina_clone_allocators.hh → src/bindings/cxx/eina_cxx/eina_clone_allocators.hh
View File

0
src/bindings/eina_cxx/eina_eo_concrete_fwd.hh → src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh
View File

0
src/bindings/eina_cxx/eina_error.hh → src/bindings/cxx/eina_cxx/eina_error.hh
View File

0
src/bindings/eina_cxx/eina_fold.hh → src/bindings/cxx/eina_cxx/eina_fold.hh
View File

0
src/bindings/eina_cxx/eina_function.hh → src/bindings/cxx/eina_cxx/eina_function.hh
View File

0
src/bindings/eina_cxx/eina_inarray.hh → src/bindings/cxx/eina_cxx/eina_inarray.hh
View File

0
src/bindings/eina_cxx/eina_inlist.hh → src/bindings/cxx/eina_cxx/eina_inlist.hh
View File

0
src/bindings/eina_cxx/eina_integer_sequence.hh → src/bindings/cxx/eina_cxx/eina_integer_sequence.hh
View File

0
src/bindings/eina_cxx/eina_iterator.hh → src/bindings/cxx/eina_cxx/eina_iterator.hh
View File

0
src/bindings/eina_cxx/eina_list.hh → src/bindings/cxx/eina_cxx/eina_list.hh
View File

0
src/bindings/eina_cxx/eina_lists_auxiliary.hh → src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh
View File

0
src/bindings/eina_cxx/eina_log.hh → src/bindings/cxx/eina_cxx/eina_log.hh
View File

0
src/bindings/eina_cxx/eina_logical.hh → src/bindings/cxx/eina_cxx/eina_logical.hh
View File

0
src/bindings/eina_cxx/eina_optional.hh → src/bindings/cxx/eina_cxx/eina_optional.hh
View File

0
src/bindings/eina_cxx/eina_pp.hh → src/bindings/cxx/eina_cxx/eina_pp.hh
View File

0
src/bindings/eina_cxx/eina_ptrarray.hh → src/bindings/cxx/eina_cxx/eina_ptrarray.hh
View File

0
src/bindings/eina_cxx/eina_ptrlist.hh → src/bindings/cxx/eina_cxx/eina_ptrlist.hh
View File

0
src/bindings/eina_cxx/eina_range_types.hh → src/bindings/cxx/eina_cxx/eina_range_types.hh
View File

0
src/bindings/eina_cxx/eina_ref.hh → src/bindings/cxx/eina_cxx/eina_ref.hh
View File

0
src/bindings/eina_cxx/eina_string_view.hh → src/bindings/cxx/eina_cxx/eina_string_view.hh
View File

0
src/bindings/eina_cxx/eina_stringshare.hh → src/bindings/cxx/eina_cxx/eina_stringshare.hh
View File

0
src/bindings/eina_cxx/eina_thread.hh → src/bindings/cxx/eina_cxx/eina_thread.hh
View File

0
src/bindings/eina_cxx/eina_throw.hh → src/bindings/cxx/eina_cxx/eina_throw.hh
View File

0
src/bindings/eina_cxx/eina_tuple.hh → src/bindings/cxx/eina_cxx/eina_tuple.hh
View File

0
src/bindings/eina_cxx/eina_tuple_c.hh → src/bindings/cxx/eina_cxx/eina_tuple_c.hh
View File

0
src/bindings/eina_cxx/eina_tuple_unwrap.hh → src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh
View File

0
src/bindings/eina_cxx/eina_type_traits.hh → src/bindings/cxx/eina_cxx/eina_type_traits.hh
View File

0
src/bindings/eina_cxx/eina_value.hh → src/bindings/cxx/eina_cxx/eina_value.hh
View File

0
src/bindings/eldbus_cxx/Eldbus.hh → src/bindings/cxx/eldbus_cxx/Eldbus.hh
View File

0
src/bindings/eldbus_cxx/eldbus_basic.hh → src/bindings/cxx/eldbus_cxx/eldbus_basic.hh
View File

0
src/bindings/eldbus_cxx/eldbus_error.hh → src/bindings/cxx/eldbus_cxx/eldbus_error.hh
View File

0
src/bindings/eldbus_cxx/eldbus_freedesktop.hh → src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh
View File

0
src/bindings/eldbus_cxx/eldbus_integer_sequence.hh → src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh
View File

0
src/bindings/eldbus_cxx/eldbus_message.hh → src/bindings/cxx/eldbus_cxx/eldbus_message.hh
View File

0
src/bindings/eldbus_cxx/eldbus_message_arguments.hh → src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh
View File

0
src/bindings/eldbus_cxx/eldbus_proxy_call.hh → src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh
View File

0
src/bindings/eldbus_cxx/eldbus_raw_tuple.hh → src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh
View File

0
src/bindings/eldbus_cxx/eldbus_service.hh → src/bindings/cxx/eldbus_cxx/eldbus_service.hh
View File

0
src/bindings/eldbus_cxx/eldbus_signature_traits.hh → src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh
View File

0
src/bindings/eo_cxx/Eo.hh → src/bindings/cxx/eo_cxx/Eo.hh
View File

0
src/bindings/eo_cxx/eo_concrete.hh → src/bindings/cxx/eo_cxx/eo_concrete.hh
View File

0
src/bindings/eo_cxx/eo_cxx_interop.hh → src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
View File

0
src/bindings/eo_cxx/eo_event.hh → src/bindings/cxx/eo_cxx/eo_event.hh
View File

0
src/bindings/eo_cxx/eo_inherit.hh → src/bindings/cxx/eo_cxx/eo_inherit.hh
View File

0
src/bindings/eo_cxx/eo_inherit_bindings.hh → src/bindings/cxx/eo_cxx/eo_inherit_bindings.hh
View File

0
src/bindings/eo_cxx/eo_init.hh → src/bindings/cxx/eo_cxx/eo_init.hh
View File

0
src/bindings/eo_cxx/eo_ops.hh → src/bindings/cxx/eo_cxx/eo_ops.hh
View File

0
src/bindings/eo_cxx/eo_private.hh → src/bindings/cxx/eo_cxx/eo_private.hh
View File

0
src/bindings/eo_cxx/eo_wref.hh → src/bindings/cxx/eo_cxx/eo_wref.hh
View File

2
src/lib/elementary/elm_image.eo
View File

@ -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)
{

14
src/tests/elementary_cxx/cxx_compile_test.cc Normal file
View File

@ -0,0 +1,14 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
# include "elementary_config.h"
#endif
#include <Elementary.hh>
#include <iostream>
int main()
{
return 0;
}