felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e67d6484b8b5dd75904b6d2368663eab4886229b
commit e67d6484b8b5dd75904b6d2368663eab4886229b Author: Felipe Magno de Almeida <[email protected]> Date: Wed Dec 13 12:36:21 2017 -0200 efl-cxx: Fixes to make dist --- Makefile.am | 2 +- configure.ac | 2 +- src/Makefile.am | 15 +- src/Makefile_Cxx.am | 176 +++++++++++----------- src/Makefile_Ecore.am | 2 +- src/Makefile_Edje.am | 2 +- src/Makefile_Efl.am | 2 +- src/Makefile_Efl_Mono.am | 91 +++++------ src/Makefile_Eldbus.am | 2 +- src/Makefile_Elementary.am | 2 +- src/Makefile_Eo.am | 2 +- src/Makefile_Eolian_Cxx.am | 9 +- src/Makefile_Evas.am | 2 +- src/examples/efl_mono/Makefile.am | 15 +- src/examples/eina_cxx/Makefile.am | 4 + src/examples/elementary/Makefile.am | 8 +- src/examples/eolian_cxx/Makefile.am | 48 +++--- src/examples/evas/Makefile.am | 2 +- src/lib/elementary/efl_ui_list.c | 18 +-- src/lib/elementary/efl_ui_list_precise_layouter.c | 3 +- src/lib/elementary/efl_ui_list_segarray.c | 1 - 21 files changed, 202 insertions(+), 206 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8fd7776ff6..35a0315270 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,7 +162,7 @@ pc/elocation.pc \ pc/elementary.pc \ pc/efl-ui.pc -if HAVE_CXX11 +if HAVE_CXX pkgconfig_DATA += \ pc/eina-cxx.pc \ pc/evas-cxx.pc \ diff --git a/configure.ac b/configure.ac index 69ea681848..b5ce7ccc27 100644 --- a/configure.ac +++ b/configure.ac @@ -1136,7 +1136,7 @@ else have_cxx11="no" fi -AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"]) +AM_CONDITIONAL([HAVE_CXX], [test "x${have_cxx11}" = "xyes"]) EFL_INTERNAL_DEPEND_PKG([EINA_CXX], [Eina]) EFL_ADD_CFLAGS([EINA_CXX], [${EFL_PTHREAD_CFLAGS}]) diff --git a/src/Makefile.am b/src/Makefile.am index 68e66b5ef1..b87c91c561 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -126,24 +126,15 @@ examples/emotion \ examples/emile \ examples/elocation \ examples/ethumb_client \ +examples/eina_cxx \ +examples/eolian_cxx \ +examples/efl_mono \ examples/elementary if HAVE_ELUA EXAMPLES_SUBDIRS += examples/elua endif -EXAMPLES_CXX = \ -examples/eina_cxx \ -examples/eolian_cxx - -if HAVE_CXX11 -EXAMPLES_SUBDIRS += $(EXAMPLES_CXX) -endif - -if HAVE_CSHARP -EXAMPLES_SUBDIRS += examples/efl_mono -endif - if ALWAYS_BUILD_EXAMPLES SUBDIRS += . $(EXAMPLES_SUBDIRS) endif diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am index bc9f3749f7..ab4b55204b 100644 --- a/src/Makefile_Cxx.am +++ b/src/Makefile_Cxx.am @@ -1,10 +1,13 @@ -if HAVE_CXX11 ### Eo C++ -CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) +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 installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/ -nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) dist_installed_eocxxheaders_DATA = \ bindings/cxx/eo_cxx/eo_concrete.hh \ bindings/cxx/eo_cxx/eo_cxx_interop.hh \ @@ -19,54 +22,16 @@ bindings/cxx/eo_cxx/eo_promise_meta.hh \ bindings/cxx/eo_cxx/eo_private.hh \ bindings/cxx/eo_cxx/efl_object_impl.hh -### Elementary C++ -installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/ -nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \ -lib/elementary/Elementary.eo.hh -dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Elementary.hh - -lib/elementary/Elementary.eo.hh: $(elm_public_eolian_files) $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX) \ - $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) - -CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) lib/elementary/Elementary.eo.hh - -### Efl C++ installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/ -nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh dist_installed_eflcxxmainheaders_DATA = lib/efl/Efl.hh lib/efl/cxx/efl_part_impl.hh -lib/efl/Efl.eo.hh: $(efl_eolian_files) $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX) \ - $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) - -CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh +installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/ +dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Elementary.hh -### Evas C++ installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh -nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh - -installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas -nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) - -installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture -nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) - -lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX) \ - $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) -CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \ - $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \ - lib/evas/Evas.eo.hh - -### Eldbus C++ installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ -nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh dist_installed_eldbuscxxmainheaders_DATA = \ bindings/cxx/eldbus_cxx/eldbus_basic.hh \ bindings/cxx/eldbus_cxx/eldbus_error.hh \ @@ -81,50 +46,13 @@ bindings/cxx/eldbus_cxx/eldbus_service.hh \ bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh \ bindings/cxx/eldbus_cxx/Eldbus_Model.hh -lib/eldbus/Eldbus_Model.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX) \ - $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) - -CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.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@/ -dist_installed_edjecxxmainheaders_DATA = lib/edje/Edje.hh -nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh - -lib/edje/Edje.eo.hh: $(edje_eolian_files) $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX) \ - $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) -CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh - -### Ecore src/lib/ecore installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ dist_installed_ecorecxxheaders_DATA = \ bindings/cxx/ecore_cxx/Ecore.hh \ bindings/cxx/ecore_cxx/Ecore_Manual.hh -nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) \ -lib/ecore/Ecore.eo.hh - -lib/ecore/Ecore.eo.hh: $(ecore_eolian_files_public) $(_EOLIAN_CXX_DEP) - $(AM_V_EOLCXX) \ - $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) - -CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) lib/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 \ @@ -166,11 +94,91 @@ bindings/cxx/eina_cxx/eina_copy_traits.hh \ bindings/cxx/eina_cxx/eina_variant.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_hh) lib/eio/Eio.eo.hh dist_installed_eiocxxmainheaders_DATA = lib/eio/Eio.hh +if HAVE_CXX +nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh +nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) +nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh +nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \ +lib/elementary/Elementary.eo.hh +nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh + +CLEANFILES = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) + +### Elementary C++ + +lib/elementary/Elementary.eo.hh: $(elm_public_eolian_files) $(_EOLIAN_CXX_DEP) + $(AM_V_EOLCXX) \ + $(MKDIR_P) $(dir $@); \ + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) + +CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) lib/elementary/Elementary.eo.hh + +### Efl C++ +lib/efl/Efl.eo.hh: $(efl_eolian_files) $(_EOLIAN_CXX_DEP) + $(AM_V_EOLCXX) \ + $(MKDIR_P) $(dir $@); \ + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) + +CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh + +### Evas C++ +nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh + +installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas +nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) + +installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture +nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) + + +lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP) + $(AM_V_EOLCXX) \ + $(MKDIR_P) $(dir $@); \ + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) + +CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \ + $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \ + lib/evas/Evas.eo.hh + + +lib/eldbus/Eldbus_Model.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP) + $(AM_V_EOLCXX) \ + $(MKDIR_P) $(dir $@); \ + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) + +CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh + +### Eet C++ + +### Generated headers src/lib/edje +dist_installed_edjecxxmainheaders_DATA = lib/edje/Edje.hh + +lib/edje/Edje.eo.hh: $(edje_eolian_files) $(_EOLIAN_CXX_DEP) + $(AM_V_EOLCXX) \ + $(MKDIR_P) $(dir $@); \ + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) + +CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh + +### Ecore src/lib/ecore +nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) \ +lib/ecore/Ecore.eo.hh + +lib/ecore/Ecore.eo.hh: $(ecore_eolian_files_public) $(_EOLIAN_CXX_DEP) + $(AM_V_EOLCXX) \ + $(MKDIR_P) $(dir $@); \ + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) + +CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) lib/ecore/Ecore.eo.hh + +## Eina src/lib/eina + +### Eio +nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.eo.hh + lib/eio/Eio.eo.hh: $(eio_eolian_files) $(_EOLIAN_CXX_DEP) $(AM_V_EOLCXX) \ $(MKDIR_P) $(dir $@); \ @@ -382,7 +390,7 @@ tests_elementary_cxx_cxx_dummy_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib endif +endif + EXTRA_DIST2 += \ tests/eina_cxx/simple.eo - -endif diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 02b06f0353..d1d79cd7e4 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -340,7 +340,7 @@ GENERATED_JS_BINDINGS += $(generated_ecore_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX ecore_eolian_cxx_hh = $(ecore_eolian_files_public:%.eo=%.eo.hh) ecore_eolian_cxx_impl_hh = $(ecore_eolian_files_public:%.eo=%.eo.impl.hh) diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 0831e01dba..c57f11130e 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -372,7 +372,7 @@ GENERATED_JS_BINDINGS += $(generated_edje_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX edje_eolian_cxx_hh = $(edje_eolian_files:%.eo=%.eo.hh) edje_eolian_cxx_impl_hh = $(edje_eolian_files:%.eo=%.eo.impl.hh) endif diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index c80d81c950..8ddbe80c38 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -174,7 +174,7 @@ generated_efl_js_bindings = $(efl_eolian_files:%.eo=%.eo.js.cc) GENERATED_JS_BINDINGS += $(generated_efl_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX efl_eolian_cxx_hh = $(efl_eolian_files:%.eo=%.eo.hh) efl_eolian_cxx_impl_hh = $(efl_eolian_files:%.eo=%.eo.impl.hh) endif diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am index 00f4dbb43e..b40cacf69e 100644 --- a/src/Makefile_Efl_Mono.am +++ b/src/Makefile_Efl_Mono.am @@ -1,3 +1,50 @@ + +efl_custom_exports_mono_files = \ + lib/efl_mono/efl_custom_exports_mono.c + +efl_eo_mono_files = \ + bindings/mono/eo_mono/object.cs \ + bindings/mono/eo_mono/iwrapper.cs \ + bindings/mono/eo_mono/workaround.cs + +efl_eina_mono_files = \ + bindings/mono/eina_mono/eina_config.cs \ + bindings/mono/eina_mono/eina_array.cs \ + bindings/mono/eina_mono/eina_hash.cs \ + bindings/mono/eina_mono/eina_list.cs \ + bindings/mono/eina_mono/eina_inarray.cs \ + bindings/mono/eina_mono/eina_inlist.cs \ + bindings/mono/eina_mono/eina_iterator.cs \ + bindings/mono/eina_mono/eina_container_common.cs \ + bindings/mono/eina_mono/eina_common.cs \ + bindings/mono/eina_mono/eina_log.cs \ + bindings/mono/eina_mono/eina_binbuf.cs \ + bindings/mono/eina_mono/eina_slice.cs \ + bindings/mono/eina_mono/eina_stringshare.cs \ + bindings/mono/eina_mono/eina_error.cs \ + bindings/mono/eina_mono/eina_value.cs + +efl_eldbus_mono_files = \ + bindings/mono/eldbus_mono/eldbus_common.cs \ + bindings/mono/eldbus_mono/eldbus_config.cs \ + bindings/mono/eldbus_mono/eldbus_connection.cs \ + bindings/mono/eldbus_mono/eldbus_message.cs \ + bindings/mono/eldbus_mono/eldbus_object.cs \ + bindings/mono/eldbus_mono/eldbus_pending.cs \ + bindings/mono/eldbus_mono/eldbus_proxy.cs \ + bindings/mono/eldbus_mono/eldbus_service.cs + +efl_ecore_evas_mono_files = \ + bindings/mono/ecore_evas_mono/ecore_evas.cs + +lib_efl_mono_libefl_mono_dll_SOURCES = \ + bindings/mono/efl_mono/efl_all.cs \ + $(builddir)/bindings/mono/efl_mono/efl_libs.cs \ + $(efl_eo_mono_files) \ + $(efl_eina_mono_files) \ + $(efl_eldbus_mono_files) \ + $(efl_ecore_evas_mono_files) + if HAVE_CSHARP bin_PROGRAMS += bin/eolian_mono/eolian_mono @@ -117,8 +164,6 @@ MCS_FLAGS += -define:WIN32 endif # Efl Custom Exports Mono auxiliary library -efl_custom_exports_mono_files = \ - lib/efl_mono/efl_custom_exports_mono.c lib_LTLIBRARIES += \ lib/efl_mono/libeflcustomexportsmono.la @@ -137,48 +182,6 @@ lib_efl_mono_libeflcustomexportsmono_la_DEPENDENCIES = @EFL_CUSTOM_EXPORTS_MONO_ #Efl Mono - C Sharp binding library bin_PROGRAMS += lib/efl_mono/libefl_mono.dll -efl_eo_mono_files = \ - bindings/mono/eo_mono/object.cs \ - bindings/mono/eo_mono/iwrapper.cs \ - bindings/mono/eo_mono/workaround.cs - -efl_eina_mono_files = \ - bindings/mono/eina_mono/eina_config.cs \ - bindings/mono/eina_mono/eina_array.cs \ - bindings/mono/eina_mono/eina_hash.cs \ - bindings/mono/eina_mono/eina_list.cs \ - bindings/mono/eina_mono/eina_inarray.cs \ - bindings/mono/eina_mono/eina_inlist.cs \ - bindings/mono/eina_mono/eina_iterator.cs \ - bindings/mono/eina_mono/eina_container_common.cs \ - bindings/mono/eina_mono/eina_common.cs \ - bindings/mono/eina_mono/eina_log.cs \ - bindings/mono/eina_mono/eina_binbuf.cs \ - bindings/mono/eina_mono/eina_slice.cs \ - bindings/mono/eina_mono/eina_stringshare.cs \ - bindings/mono/eina_mono/eina_error.cs \ - bindings/mono/eina_mono/eina_value.cs - -efl_eldbus_mono_files = \ - bindings/mono/eldbus_mono/eldbus_common.cs \ - bindings/mono/eldbus_mono/eldbus_config.cs \ - bindings/mono/eldbus_mono/eldbus_connection.cs \ - bindings/mono/eldbus_mono/eldbus_message.cs \ - bindings/mono/eldbus_mono/eldbus_object.cs \ - bindings/mono/eldbus_mono/eldbus_pending.cs \ - bindings/mono/eldbus_mono/eldbus_proxy.cs \ - bindings/mono/eldbus_mono/eldbus_service.cs - -efl_ecore_evas_mono_files = \ - bindings/mono/ecore_evas_mono/ecore_evas.cs - -lib_efl_mono_libefl_mono_dll_SOURCES = \ - bindings/mono/efl_mono/efl_all.cs \ - $(builddir)/bindings/mono/efl_mono/efl_libs.cs \ - $(efl_eo_mono_files) \ - $(efl_eina_mono_files) \ - $(efl_eldbus_mono_files) \ - $(efl_ecore_evas_mono_files) lib/efl_mono/libefl_mono.dll: $(lib_efl_mono_libefl_mono_dll_SOURCES) lib/efl_mono/$(am__dirstamp) $(efl_eolian_mono_files) lib/efl_mono/libefl_mono.dll.config @rm -f lib/efl_mono/libefl_mono.dll diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am index 988e892f88..c612b3cac1 100644 --- a/src/Makefile_Eldbus.am +++ b/src/Makefile_Eldbus.am @@ -108,7 +108,7 @@ bin_eldbus_eldbus_codegen_LDADD = @USE_ELDBUS_LIBS@ endif bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@ -if HAVE_CXX11 +if HAVE_CXX eldbus_eolian_cxx_hh = $(eldbus_eolian_files:%.eo=%.eo.hh) eldbus_eolian_cxx_impl_hh = $(eldbus_eolian_files:%.eo=%.eo.impl.hh) endif diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 17b689f07c..d95ddd9774 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -1478,7 +1478,7 @@ GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh) elementary_eolian_cxx_impl_hh = $(elm_public_eolian_files:%.eo=%.eo.impl.hh) endif diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index e2551bce88..438fbf222a 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -237,7 +237,7 @@ GENERATED_JS_BINDINGS += $(generated_eo_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX eo_eolian_cxx_hh = $(eo_eolian_files:%.eo=%.eo.hh) eo_eolian_cxx_impl_hh = $(eo_eolian_files:%.eo=%.eo.impl.hh) diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am index 6abb3d6a40..3bc12415ca 100644 --- a/src/Makefile_Eolian_Cxx.am +++ b/src/Makefile_Eolian_Cxx.am @@ -1,7 +1,6 @@ ### Library -if HAVE_CXX11 installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/ dist_installed_eoliancxxmainheaders_DATA = \ lib/eolian_cxx/Eolian_Cxx.hh @@ -33,6 +32,7 @@ lib/eolian_cxx/grammar/header_include_directive.hpp \ lib/eolian_cxx/grammar/implementation_include_directive.hpp \ lib/eolian_cxx/grammar/impl_header.hpp \ lib/eolian_cxx/grammar/indentation.hpp \ +lib/eolian_cxx/grammar/integral.hpp \ lib/eolian_cxx/grammar/keyword.hpp \ lib/eolian_cxx/grammar/klass_def.hpp \ lib/eolian_cxx/grammar/kleene.hpp \ @@ -40,14 +40,19 @@ lib/eolian_cxx/grammar/list.hpp \ lib/eolian_cxx/grammar/meta.hpp \ lib/eolian_cxx/grammar/namespace.hpp \ lib/eolian_cxx/grammar/parameter.hpp \ +lib/eolian_cxx/grammar/part_declaration.hpp \ +lib/eolian_cxx/grammar/part_implementation.hpp \ lib/eolian_cxx/grammar/qualifier_def.hpp \ lib/eolian_cxx/grammar/sequence.hpp \ lib/eolian_cxx/grammar/string.hpp \ +lib/eolian_cxx/grammar/type_function_declaration.hpp \ lib/eolian_cxx/grammar/type.hpp \ lib/eolian_cxx/grammar/type_impl.hpp \ +lib/eolian_cxx/grammar/types_definition.hpp \ lib/eolian_cxx/grammar/type_traits.hpp ### Binary +if HAVE_CXX bin_PROGRAMS += bin/eolian_cxx/eolian_cxx @@ -176,6 +181,7 @@ tests_eolian_cxx_eolian_cxx_suite_LDADD = \ tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ endif +endif EXTRA_DIST2 += \ tests/eolian_cxx/simple.eo \ @@ -194,4 +200,3 @@ tests/eolian_cxx/cyclic2.eo include Makefile_Eolian_Cxx_Helper.am -endif diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 43ad9f7f7a..cf8a6606a3 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2573,7 +2573,7 @@ GENERATED_JS_BINDINGS += $(generated_evas_js_bindings) endif -if HAVE_CXX11 +if HAVE_CXX evas_canvas_eolian_cxx_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.hh) \ $(evas_eolian_legacy_files:%.eo=%.eo.hh) evas_canvas_eolian_cxx_impl_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.impl.hh) \ diff --git a/src/examples/efl_mono/Makefile.am b/src/examples/efl_mono/Makefile.am index 273ede1264..49fc1c2cb3 100644 --- a/src/examples/efl_mono/Makefile.am +++ b/src/examples/efl_mono/Makefile.am @@ -1,17 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in -if HAVE_CSHARP - include $(top_srcdir)/src/Makefile_Eolian_Helper.am include $(top_srcdir)/src/Makefile_Eolian_Mono_Helper.am include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am -SRCS = -EXTRA_FILES = +SRCS = example_numberwrapper.c +EXTRA_FILES = example_numberwrapper.eo EXTRA_PROGRAMS = GENERATED = CLEANFILES = +if HAVE_CSHARP + # Simple object used by the examples EOLIAN_FLAGS := $(EOLIAN_FLAGS) @@ -54,8 +54,6 @@ libexample_numberwrapper_la_SOURCES = example_numberwrapper.c libexample_numberwrapper_la_LDFLAGS = -shared libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT -SRCS += example_numberwrapper.c -EXTRA_FILES += example_numberwrapper.eo GENERATED += example_numberwrapper.eo.h example_numberwrapper.eo.c EoInherit01.exe.config # CSharp examples @@ -108,11 +106,11 @@ GENERATED += example_numberwrapper.eo.cs # Finishing +CLEANFILES += $(GENERATED) +endif EXTRA_DIST = $(EXTRA_FILES) -CLEANFILES += $(GENERATED) - examples: $(EXTRA_PROGRAMS) clean-local: @@ -131,4 +129,3 @@ if ALWAYS_BUILD_EXAMPLES noinst_PROGRAMS = $(EXTRA_PROGRAMS) endif -endif diff --git a/src/examples/eina_cxx/Makefile.am b/src/examples/eina_cxx/Makefile.am index 6e51415850..4dfd7ebb49 100644 --- a/src/examples/eina_cxx/Makefile.am +++ b/src/examples/eina_cxx/Makefile.am @@ -13,6 +13,8 @@ SRCS = \ eina_cxx_list_01.cc \ eina_cxx_thread_01.cc +if HAVE_CXX + EXTRA_PROGRAMS = \ eina_cxx_list_01 \ eina_cxx_thread_01 @@ -23,6 +25,8 @@ eina_cxx_list_01.cc eina_cxx_thread_01_SOURCES = \ eina_cxx_thread_01.cc +endif + examples: $(EXTRA_PROGRAMS) clean-local: diff --git a/src/examples/elementary/Makefile.am b/src/examples/elementary/Makefile.am index 879a38f824..00cf29e307 100644 --- a/src/examples/elementary/Makefile.am +++ b/src/examples/elementary/Makefile.am @@ -185,7 +185,6 @@ efl_ui_list_example_1.c \ efl_ui_list_example_2.c \ efl_ui_list_example_3.c -if HAVE_CXX11 SRCS += \ bg_cxx_example_01.cc \ bg_cxx_example_02.cc \ @@ -208,7 +207,6 @@ table_cxx_example_01.cc \ table_cxx_example_02.cc \ toolbar_cxx_example_01.cc \ $(NULL) -endif EDCS = \ twitter_example_01.edc \ @@ -422,7 +420,7 @@ efl_ui_list_example_3 $(MKDIR_P) sphere_hunter/; \ $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@ -if HAVE_CXX11 +if HAVE_CXX examples_PROGRAMS += \ bg_cxx_example_01 \ bg_cxx_example_02 \ @@ -459,7 +457,7 @@ efl_thread_2_SOURCES = efl_thread_2.c efl_thread_3_SOURCES = efl_thread_3.c efl_thread_4_SOURCES = efl_thread_4.c -if HAVE_CXX11 +if HAVE_CXX bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc box_cxx_example_02_SOURCES = box_cxx_example_02.cc @@ -568,7 +566,7 @@ table_example_01:table_example_01.png:0.0 \ table_example_02:table_example_02.png:0.0 \ menu_example_01:menu_example_01.png:0.5 -if HAVE_CXX11 +if HAVE_CXX SCREENSHOTS += \ bg_cxx_example_01:bg_cxx_example_01.png:0.0 \ bg_cxx_example_02:bg_cxx_example_02.png:0.0 \ diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am index df5a370b19..a908170856 100644 --- a/src/examples/eolian_cxx/Makefile.am +++ b/src/examples/eolian_cxx/Makefile.am @@ -69,6 +69,24 @@ LDADD = \ $(top_builddir)/src/lib/evas/libevas.la \ $(top_builddir)/src/lib/ecore_evas/libecore_evas.la +IMPL = \ + colourable.c \ + colourable_cxx.cc \ + colourablesquare.c \ + colourablesquare_cxx.cc + +SRCS = \ + eolian_cxx_simple_01.cc \ + eolian_cxx_callbacks_01.cc \ + $(IMPL) + +ECXX_EXAMPLE_EOS = \ + ns_colourable.eo \ + ns_colourablesquare.eo + +dist_example_eos_SOURCES = $(ECXX_EXAMPLE_EOS) + +if HAVE_CXX GENERATED = \ ns_colourable.eo.c \ ns_colourable.eo.h \ @@ -82,30 +100,10 @@ GENERATED = \ BUILT_SOURCES = $(GENERATED) CLEANFILES += $(BUILT_SOURCES) -ECXX_EXAMPLE_EOS = \ - ns_colourable.eo \ - ns_colourablesquare.eo - -IMPL = \ - colourable.c \ - colourable_cxx.cc \ - colourablesquare.c \ - colourablesquare_cxx.cc - -SRCS = \ - eolian_cxx_simple_01.cc \ - eolian_cxx_callbacks_01.cc \ - $(IMPL) -# eolian_cxx_inherit_01.cc - EXTRA_PROGRAMS = \ eolian_cxx_simple_01 \ eolian_cxx_simple_01_cxx_impl \ eolian_cxx_callbacks_01 -# eolian_cxx_inherit_01 - -DATA_FILES = Makefile.examples $(ECXX_EXAMPLE_EOS) -EXTRA_DIST = $(DATA_FILES) eolian_cxx_simple_01_SOURCES = \ eolian_cxx_simple_01.cc \ @@ -123,13 +121,11 @@ eolian_cxx_simple_01_cxx_impl_SOURCES = \ colourablesquare_cxx.cc eolian_cxx_simple_01_cxx_impl.$(OBJEXT): $(GENERATED) -# eolian_cxx_inherit_01_SOURCES = \ -# eolian_cxx_inherit_01.cc \ -# colourable.c \ -# colourablesquare.c -# eolian_cxx_inherit_01.$(OBJEXT): $(GENERATED) - eolian_cxx_callbacks_01_SOURCES = eolian_cxx_callbacks_01.cc +endif + +DATA_FILES = Makefile.examples $(ECXX_EXAMPLE_EOS) +EXTRA_DIST = $(DATA_FILES) %.eo.hh: %.eo $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $< diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index 2fc462ea2e..2c5416e3cf 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -356,7 +356,7 @@ evas_aspect_hints_SOURCES = evas-aspect-hints.c evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD) -if HAVE_CXX11 +if HAVE_CXX EXTRA_PROGRAMS += evas_cxx_rectangle evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c index 4a70ab5bf4..1b3d8ce9ee 100644 --- a/src/lib/elementary/efl_ui_list.c +++ b/src/lib/elementary/efl_ui_list.c @@ -323,12 +323,6 @@ _efl_ui_list_efl_canvas_group_group_del(Eo *obj, Efl_Ui_List_Data *pd) efl_canvas_group_del(efl_super(obj, MY_CLASS)); } -EOLIAN static void -_efl_ui_list_efl_ui_focus_manager_focus_set(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, Efl_Ui_Focus_Object *focus) -{ - efl_ui_focus_manager_focus_set(pd->manager, focus); -} - EOLIAN static Efl_Ui_Focus_Manager* _efl_ui_list_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) { @@ -408,7 +402,7 @@ _efl_ui_list_layout_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, Efl_U } EOLIAN static void -_efl_ui_list_efl_ui_view_model_set(Eo *obj, Efl_Ui_List_Data *pd, Efl_Model *model) +_efl_ui_list_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, Efl_Model *model) { if (pd->model == model) return; @@ -478,19 +472,19 @@ _efl_ui_list_efl_access_selection_selected_child_deselect(Eo *obj EINA_UNUSED, E } EOLIAN Eina_Bool -_efl_ui_list_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, int child_index) +_efl_ui_list_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, int child_index EINA_UNUSED) { return EINA_FALSE; } EOLIAN Eina_Bool -_efl_ui_list_efl_access_selection_all_children_select(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd) +_efl_ui_list_efl_access_selection_all_children_select(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED) { return EINA_TRUE; } EOLIAN Eina_Bool -_efl_ui_list_efl_access_selection_clear(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd) +_efl_ui_list_efl_access_selection_clear(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED) { return EINA_TRUE; } @@ -502,13 +496,13 @@ _efl_ui_list_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Efl_Ui_Lis } static Eina_Bool -_key_action_move(Evas_Object *obj, const char *params) +_key_action_move(Evas_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { return EINA_FALSE; } static Eina_Bool -_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED) +_key_action_select(Evas_Object *obj EINA_UNUSED, const char *params EINA_UNUSED) { return EINA_FALSE; } diff --git a/src/lib/elementary/efl_ui_list_precise_layouter.c b/src/lib/elementary/efl_ui_list_precise_layouter.c index 7f37b7f4b6..ce66239be3 100644 --- a/src/lib/elementary/efl_ui_list_precise_layouter.c +++ b/src/lib/elementary/efl_ui_list_precise_layouter.c @@ -264,7 +264,8 @@ _child_removed_cb(void *data, const Efl_Event *event) if (nodedata->min.w == litem->min.w) nodedata->min.w = 0; - for (i = 0; i != itemnode->length; ++i) + + for (i = 0; i != itemnode->length; ++i) { layout_item = (Efl_Ui_List_LayoutItem *)itemnode->pointers[i]; if (nodedata->min.w < layout_item->min.w) diff --git a/src/lib/elementary/efl_ui_list_segarray.c b/src/lib/elementary/efl_ui_list_segarray.c index 79c55fbbe4..08740b6c4d 100644 --- a/src/lib/elementary/efl_ui_list_segarray.c +++ b/src/lib/elementary/efl_ui_list_segarray.c @@ -76,7 +76,6 @@ _alloc_node(Efl_Ui_List_SegArray* segarray, int first, int max) node = calloc(1, sizeof(Efl_Ui_List_SegArray_Node) + max*sizeof(Efl_Ui_List_Item*)); node->first = first; node->max = max; - void* tmp = segarray->root; segarray->root = (void*)eina_rbtree_inline_insert(EINA_RBTREE_GET(segarray->root), EINA_RBTREE_GET(node), EINA_RBTREE_CMP_NODE_CB(&_rbtree_compare), NULL); segarray->node_count++; --
