summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2018-02-01 15:38:48 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2018-02-08 10:50:04 -0300
commit9a4b8f38004f4120b3dddbcb230de7ca97cf8be2 (patch)
tree55745ef782eddb1fbd5c961b37a6cfa8a7cda11a
parent17b9f00f7eb70547a8c325a9b057ad36606a6a8b (diff)
efl_mono: Distcheck fixes
- Export required sources - Avoid generated sources being passed as static ones
-rw-r--r--src/Makefile.am6
-rw-r--r--src/Makefile_Efl_Mono.am63
-rw-r--r--src/bindings/mono/eo_mono/object.cs10
-rw-r--r--src/examples/efl_mono/Makefile.am8
4 files changed, 65 insertions, 22 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b87c91c561..a0252309c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,6 +165,7 @@ dist-hook:
165 @mkdir -p $(distdir)/tests/efreet/data $(distdir)/tests/edje/data 165 @mkdir -p $(distdir)/tests/efreet/data $(distdir)/tests/edje/data
166 @mkdir -p $(distdir)/tests/emotion/data $(distdir)/tests/evas/meshes/md2 166 @mkdir -p $(distdir)/tests/emotion/data $(distdir)/tests/evas/meshes/md2
167 @mkdir -p $(distdir)/tests/evas/meshes/obj $(distdir)/tests/efreet/data/sub 167 @mkdir -p $(distdir)/tests/evas/meshes/obj $(distdir)/tests/efreet/data/sub
168 @mkdir -p $(distdir)/tests/efl_mono
168 @mkdir -p $(distdir)/scripts/eina $(distdir)/scripts/elua/modules 169 @mkdir -p $(distdir)/scripts/eina $(distdir)/scripts/elua/modules
169 @mkdir -p $(distdir)/scripts/elua/core $(distdir)/scripts/elua/apps/docgen 170 @mkdir -p $(distdir)/scripts/elua/core $(distdir)/scripts/elua/apps/docgen
170 @mkdir -p $(distdir)/lib/evas/common/evas_op_add $(distdir)/lib/evas/common/evas_op_copy 171 @mkdir -p $(distdir)/lib/evas/common/evas_op_add $(distdir)/lib/evas/common/evas_op_copy
@@ -173,6 +174,11 @@ dist-hook:
173 @mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina 174 @mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina
174 @mkdir -p $(distdir)/wayland_protocol $(distdir)/lib/efl_wl/ 175 @mkdir -p $(distdir)/wayland_protocol $(distdir)/lib/efl_wl/
175 @mkdir -p $(distdir)/modules/evas/engines/software_generic/filters/blur 176 @mkdir -p $(distdir)/modules/evas/engines/software_generic/filters/blur
177 @mkdir -p $(distdir)/bindings/mono/ecore_evas_mono
178 @mkdir -p $(distdir)/bindings/mono/efl_mono
179 @mkdir -p $(distdir)/bindings/mono/eina_mono
180 @mkdir -p $(distdir)/bindings/mono/eldbus_mono
181 @mkdir -p $(distdir)/bindings/mono/eo_mono
176 for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done 182 for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done
177 183
178clean-local: 184clean-local:
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 96d8bf74be..ac7c68604f 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -3,7 +3,6 @@ efl_custom_exports_mono_files = \
3 lib/efl_mono/efl_custom_exports_mono.c 3 lib/efl_mono/efl_custom_exports_mono.c
4 4
5efl_eo_mono_files = \ 5efl_eo_mono_files = \
6 bindings/mono/eo_mono/object.cs \
7 bindings/mono/eo_mono/iwrapper.cs \ 6 bindings/mono/eo_mono/iwrapper.cs \
8 bindings/mono/eo_mono/workaround.cs 7 bindings/mono/eo_mono/workaround.cs
9 8
@@ -37,6 +36,8 @@ efl_eldbus_mono_files = \
37efl_ecore_evas_mono_files = \ 36efl_ecore_evas_mono_files = \
38 bindings/mono/ecore_evas_mono/ecore_evas.cs 37 bindings/mono/ecore_evas_mono/ecore_evas.cs
39 38
39# Static C# source files don't go into a _SOURCES var as the dll target
40# is custom built instead of through _LTLIBRARIES/_LIBRARIES
40lib_efl_mono_libefl_mono_dll_sources = \ 41lib_efl_mono_libefl_mono_dll_sources = \
41 bindings/mono/efl_mono/efl_all.cs \ 42 bindings/mono/efl_mono/efl_all.cs \
42 $(efl_eo_mono_files) \ 43 $(efl_eo_mono_files) \
@@ -44,16 +45,47 @@ lib_efl_mono_libefl_mono_dll_sources = \
44 $(efl_eldbus_mono_files) \ 45 $(efl_eldbus_mono_files) \
45 $(efl_ecore_evas_mono_files) 46 $(efl_ecore_evas_mono_files)
46 47
48efl_mono_test_files = \
49 tests/efl_mono/test_testing.eo \
50 tests/efl_mono/test_numberwrapper.eo \
51 tests/efl_mono/mono_test_driver.sh
52
47EXTRA_DIST2 += \ 53EXTRA_DIST2 += \
48bindings/mono/efl_mono/efl_libs.cs.in \ 54 $(lib_efl_mono_libefl_mono_dll_sources) \
49bindings/mono/efl_mono/efl_libs.csv.in 55 $(efl_mono_test_files) \
56 bindings/mono/efl_mono/efl_libs.cs.in \
57 bindings/mono/efl_mono/efl_libs.csv.in
50 58
51if HAVE_CSHARP 59if HAVE_CSHARP
52 60
53bin_PROGRAMS += bin/eolian_mono/eolian_mono 61bin_PROGRAMS += bin/eolian_mono/eolian_mono
54 62
55bin_eolian_mono_eolian_mono_SOURCES = \ 63bin_eolian_mono_eolian_mono_SOURCES = \
56 bin/eolian_mono/eolian_mono.cc 64 bin/eolian_mono/eolian_mono.cc \
65 bin/eolian_mono/eolian/mono/documentation.hh \
66 bin/eolian_mono/eolian/mono/type.hh \
67 bin/eolian_mono/eolian/mono/marshall_annotation.hh \
68 bin/eolian_mono/eolian/mono/function_pointer.hh \
69 bin/eolian_mono/eolian/mono/namespace.hh \
70 bin/eolian_mono/eolian/mono/function_blacklist.hh \
71 bin/eolian_mono/eolian/mono/function_definition.hh \
72 bin/eolian_mono/eolian/mono/name_helpers.hh \
73 bin/eolian_mono/eolian/mono/function_declaration.hh \
74 bin/eolian_mono/eolian/mono/helpers.hh \
75 bin/eolian_mono/eolian/mono/function_helpers.hh \
76 bin/eolian_mono/eolian/mono/marshall_type_impl.hh \
77 bin/eolian_mono/eolian/mono/keyword.hh \
78 bin/eolian_mono/eolian/mono/function_registration.hh \
79 bin/eolian_mono/eolian/mono/enum_definition.hh \
80 bin/eolian_mono/eolian/mono/struct_definition.hh \
81 bin/eolian_mono/eolian/mono/parameter.hh \
82 bin/eolian_mono/eolian/mono/utils.hh \
83 bin/eolian_mono/eolian/mono/using_decl.hh \
84 bin/eolian_mono/eolian/mono/marshall_type.hh \
85 bin/eolian_mono/eolian/mono/klass.hh \
86 bin/eolian_mono/eolian/mono/type_impl.hh \
87 bin/eolian_mono/eolian/mono/generation_contexts.hh
88
57bin_eolian_mono_eolian_mono_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ 89bin_eolian_mono_eolian_mono_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
58-I$(top_srcdir)/src/lib/eolian_cxx/ \ 90-I$(top_srcdir)/src/lib/eolian_cxx/ \
59-I$(top_srcdir)/src/bin/eolian_mono/ \ 91-I$(top_srcdir)/src/bin/eolian_mono/ \
@@ -134,6 +166,13 @@ lib/elementary/elm_genlist_item.eo.cs \
134lib/elementary/elm_gengrid.eo.cs \ 166lib/elementary/elm_gengrid.eo.cs \
135lib/elementary/elm_glview.eo.cs 167lib/elementary/elm_glview.eo.cs
136 168
169efl_mono_blacklisted_files = \
170$(evas_eolian_blacklisted_files) \
171$(efl_eolian_blacklisted_files) \
172$(ecore_eolian_blacklisted_files) \
173$(eo_eolian_blacklisted_files) \
174$(elementary_eolian_blacklisted_files)
175
137efl_eolian_mono_files = \ 176efl_eolian_mono_files = \
138$(filter-out $(eo_eolian_blacklisted_files),$(eo_eolian_files:%.eo=%.eo.cs)) \ 177$(filter-out $(eo_eolian_blacklisted_files),$(eo_eolian_files:%.eo=%.eo.cs)) \
139$(filter-out $(ecore_eolian_blacklisted_files),$(ecore_eolian_files_public:%.eo=%.eo.cs)) \ 178$(filter-out $(ecore_eolian_blacklisted_files),$(ecore_eolian_files_public:%.eo=%.eo.cs)) \
@@ -155,7 +194,6 @@ $(evas_canvas_eolian_type_files:%.eot=%.eot.cs) \
155lib/eo/eina_types.eot.cs 194lib/eo/eina_types.eot.cs
156 195
157efl_mono_files_gen =\ 196efl_mono_files_gen =\
158$(lib_efl_mono_libefl_mono_dll_sources) \
159$(efl_eolian_mono_files) \ 197$(efl_eolian_mono_files) \
160$(builddir)/bindings/mono/efl_mono/efl_libs.cs 198$(builddir)/bindings/mono/efl_mono/efl_libs.cs
161 199
@@ -163,7 +201,10 @@ $(builddir)/bindings/mono/efl_mono/efl_libs.cs
163installed_eflmonomainheadersdir = $(includedir)/efl-mono-@VMAJ@/ 201installed_eflmonomainheadersdir = $(includedir)/efl-mono-@VMAJ@/
164nodist_installed_eflmonomainheaders_DATA = $(efl_eolian_files:%.eo=%.eo.cs) $(builddir)/bindings/mono/efl_mono/efl_libs.csv 202nodist_installed_eflmonomainheaders_DATA = $(efl_eolian_files:%.eo=%.eo.cs) $(builddir)/bindings/mono/efl_mono/efl_libs.csv
165 203
166CLEANFILES += $(efl_mono_files_gen) 204CLEANFILES += $(efl_mono_files_gen) $(efl_mono_blacklisted_files) \
205 $(builddir)/lib/efl_mono/libefl_mono.dll \
206 $(builddir)/lib/efl_mono/libefl_mono.xml \
207 $(builddir)/lib/efl_mono/libefl_mono.dll.config
167 208
168if HAVE_WIN32 209if HAVE_WIN32
169 210
@@ -192,7 +233,7 @@ lib_efl_mono_libeflcustomexportsmono_la_DEPENDENCIES = @EFL_CUSTOM_EXPORTS_MONO_
192 233
193libefl_mono_dll_MCS_FLAGS = -doc:lib/efl_mono/libefl_mono.xml 234libefl_mono_dll_MCS_FLAGS = -doc:lib/efl_mono/libefl_mono.xml
194 235
195lib/efl_mono/libefl_mono.dll: $(efl_mono_files_dist) lib/efl_mono/$(am__dirstamp) $(efl_mono_files_gen) lib/efl_mono/libefl_mono.dll.config 236lib/efl_mono/libefl_mono.dll: $(efl_mono_files_dist) lib/efl_mono/$(am__dirstamp) $(lib_efl_mono_libefl_mono_dll_sources) $(efl_mono_files_gen) lib/efl_mono/libefl_mono.dll.config
196 @rm -f lib/efl_mono/libefl_mono.dll 237 @rm -f lib/efl_mono/libefl_mono.dll
197 $(AM_V_MCS) $(MCS) $(MCS_FLAGS) $(libefl_mono_dll_MCS_FLAGS) -out:$@ -t:library $(filter %.cs, $(^)) 238 $(AM_V_MCS) $(MCS) $(MCS_FLAGS) $(libefl_mono_dll_MCS_FLAGS) -out:$@ -t:library $(filter %.cs, $(^))
198 239
@@ -215,6 +256,12 @@ cp -f $(builddir)/bindings/mono/efl_mono/efl_libs.csv $(DESTDIR)$(datadir)/efl_m
215 256
216all-local: lib/efl_mono/libefl_mono.dll 257all-local: lib/efl_mono/libefl_mono.dll
217 258
259uninstall-local:
260 rm -rf @eflmonodlldir@/libefl_mono.dll
261 rm -rf @eflmonodlldir@/libefl_mono.xml
262 rm -rf $(DESTDIR)$(datadir)/efl_mono
263 rm -rf src/tests/efl_mono
264
218 265
219### MSBuild 266### MSBuild
220 267
@@ -403,7 +450,7 @@ tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP)
403 $(MKDIR_P) $(dir $@); \ 450 $(MKDIR_P) $(dir $@); \
404 $(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport "@DLIB_PREFIX_MONO@efl_mono_native_test@DLIB_SUFFIX_MONO@" -o $@ $(ALL_EO_REFS) $< 451 $(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport "@DLIB_PREFIX_MONO@efl_mono_native_test@DLIB_SUFFIX_MONO@" -o $@ $(ALL_EO_REFS) $<
405 452
406CLEANFILES += tests/efl_mono/libefl_mono_test.dll tests/efl_mono/test_testing.eo.cs tests/efl_mono/test_numberwrapper.eo.cs tests/efl_mono/test_testing.eo.c tests/efl_mono/test_numberwrapper.eo.c tests/efl_mono/test_testing.eo.h tests/efl_mono/test_numberwrapper.eo.h 453CLEANFILES += tests/efl_mono/libefl_mono_test.dll tests/efl_mono/test_testing.eo.cs tests/efl_mono/test_numberwrapper.eo.cs tests/efl_mono/test_testing.eo.c tests/efl_mono/test_numberwrapper.eo.c tests/efl_mono/test_testing.eo.h tests/efl_mono/test_numberwrapper.eo.h tests/efl_mono/efl_mono.config
407 454
408endif 455endif
409 456
diff --git a/src/bindings/mono/eo_mono/object.cs b/src/bindings/mono/eo_mono/object.cs
deleted file mode 100644
index 08e1e5f0ef..0000000000
--- a/src/bindings/mono/eo_mono/object.cs
+++ /dev/null
@@ -1,10 +0,0 @@
1
2namespace efl {
3
4using System;
5
6// public interface Object : efl.eo.IWrapper
7// {
8// }
9
10}
diff --git a/src/examples/efl_mono/Makefile.am b/src/examples/efl_mono/Makefile.am
index fe271e9f10..84d93bc6f9 100644
--- a/src/examples/efl_mono/Makefile.am
+++ b/src/examples/efl_mono/Makefile.am
@@ -66,9 +66,9 @@ example_numberwrapper.eo.cs: example_numberwrapper.eo
66 $(AM_V_EOLMONO) \ 66 $(AM_V_EOLMONO) \
67 $(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport example_numberwrapper -o $@ -r $(top_builddir)/src/bindings/mono/efl_mono/efl_libs.csv $< 67 $(EOLIAN_MONO) $(EOLIAN_FLAGS) $(EOLIAN_MONO_FLAGS) --dllimport example_numberwrapper -o $@ -r $(top_builddir)/src/bindings/mono/efl_mono/efl_libs.csv $<
68 68
69EoInherit01_SOURCES = EoInherit01.cs example_numberwrapper.eo.cs 69EoInherit01_SOURCES = EoInherit01.cs
70#EoInherit01_files = $(EoInherit01_exe_srcs) example_numberwrapper.eo.cs 70#EoInherit01_files = $(EoInherit01_exe_srcs) example_numberwrapper.eo.cs
71EoInherit01$(EXEEXT): $(EoInherit01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la EoInherit01$(EXEEXT).config 71EoInherit01$(EXEEXT): $(EoInherit01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la EoInherit01$(EXEEXT).config example_numberwrapper.eo.cs
72 @rm -f $@ 72 @rm -f $@
73 $(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^)) 73 $(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
74 74
@@ -87,8 +87,8 @@ EoInherit01$(EXEEXT).config:
87 echo " </runtime>" >> $@ 87 echo " </runtime>" >> $@
88 echo "</configuration>" >> $@ 88 echo "</configuration>" >> $@
89 89
90FunctionPointer01_SOURCES = FunctionPointer01.cs example_numberwrapper.eo.cs 90FunctionPointer01_SOURCES = FunctionPointer01.cs
91FunctionPointer01$(EXEEXT): $(FunctionPointer01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la 91FunctionPointer01$(EXEEXT): $(FunctionPointer01_SOURCES) $(am_dirstamp) $(top_builddir)/src/lib/efl_mono/libefl_mono.dll libexample_numberwrapper.la example_numberwrapper.eo.cs
92 @rm -f $@ 92 @rm -f $@
93 $(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^)) 93 $(AM_V_MCS) $(MCS) $(MCS_FLAGS) -r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll -out:$@ $(filter %.cs, $(^))
94 94