summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-03-14 12:43:51 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-03-14 12:44:00 -0400
commit30bb8395c38bbbdd21708ddc5413c869aca6714b (patch)
treef071ebd208c45a159df4dcc893c93ce38fd229dd
parent8a6e89358dcf1dc3f7ee266f104cc943bb6fadc0 (diff)
build: add a option to disable eo file installation
Summary: this is done because .eo files are not stable, and in order to stop people depending on it, its better for now to disable the installation of them for now. ref T7676 Reviewers: stefan_schmidt, cedric, zmike, devilhorns Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7676 Differential Revision: https://phab.enlightenment.org/D7897
-rw-r--r--meson_options.txt6
-rw-r--r--src/lib/ecore/meson.build8
-rw-r--r--src/lib/ecore_audio/meson.build8
-rw-r--r--src/lib/ecore_con/meson.build8
-rw-r--r--src/lib/ector/cairo/meson.build9
-rw-r--r--src/lib/ector/gl/meson.build9
-rw-r--r--src/lib/ector/meson.build8
-rw-r--r--src/lib/ector/software/meson.build9
-rw-r--r--src/lib/edje/meson.build9
-rw-r--r--src/lib/efl/interfaces/meson.build8
-rw-r--r--src/lib/eio/meson.build9
-rw-r--r--src/lib/eldbus/meson.build9
-rw-r--r--src/lib/elementary/meson.build9
-rw-r--r--src/lib/emotion/meson.build12
-rw-r--r--src/lib/eo/meson.build8
-rw-r--r--src/lib/evas/meson.build8
16 files changed, 90 insertions, 47 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 7c0c253942..8c136fe9e1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -366,3 +366,9 @@ option('eolian-bootstrap',
366 value : false, 366 value : false,
367 description : 'Only build efl up to eolian_gen and install eina libeolian and eolian_gen, usefull for cross compiles' 367 description : 'Only build efl up to eolian_gen and install eina libeolian and eolian_gen, usefull for cross compiles'
368) 368)
369
370option('install-eo-files',
371 type: 'boolean',
372 value: false,
373 description : 'Set this to false to not install any eo file'
374)
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index a40c45a5e3..64d255fe73 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -220,9 +220,11 @@ ecore = declare_dependency(
220 220
221eolian_ecore_dir = join_paths(eolian_include_dir, package_version_name) 221eolian_ecore_dir = join_paths(eolian_include_dir, package_version_name)
222 222
223install_data(pub_eo_files + pub_eo_types_files, 223if get_option('install-eo-files')
224 install_dir: eolian_ecore_dir 224 install_data(pub_eo_files + pub_eo_types_files,
225) 225 install_dir: eolian_ecore_dir
226 )
227endif
226 228
227install_headers(ecore_header_src, 229install_headers(ecore_header_src,
228 install_dir : dir_package_include, 230 install_dir : dir_package_include,
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index bc3215e62c..cbcaca4931 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -92,9 +92,11 @@ ecore_audio = declare_dependency(
92 dependencies: ecore_audio_pub_deps, 92 dependencies: ecore_audio_pub_deps,
93) 93)
94 94
95install_data(pub_eo_files + pub_eo_types_files, 95if get_option('install-eo-files')
96 install_dir: eolian_ecore_dir 96 install_data(pub_eo_files + pub_eo_types_files,
97) 97 install_dir: eolian_ecore_dir
98 )
99endif
98 100
99install_headers(ecore_audio_header_src, 101install_headers(ecore_audio_header_src,
100 install_dir : dir_package_include, 102 install_dir : dir_package_include,
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index d46a8cdb04..743904285c 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -200,9 +200,11 @@ ecore_con = declare_dependency(
200 dependencies: ecore_con_pub_deps, 200 dependencies: ecore_con_pub_deps,
201) 201)
202 202
203install_data(pub_eo_files + pub_eo_types_files, 203if get_option('install-eo-files')
204 install_dir: eolian_ecore_dir 204 install_data(pub_eo_files + pub_eo_types_files,
205) 205 install_dir: eolian_ecore_dir
206 )
207endif
206 208
207install_headers(ecore_con_header_src, 209install_headers(ecore_con_header_src,
208 install_dir : dir_package_include, 210 install_dir : dir_package_include,
diff --git a/src/lib/ector/cairo/meson.build b/src/lib/ector/cairo/meson.build
index 123ea90d1f..094aedb3e6 100644
--- a/src/lib/ector/cairo/meson.build
+++ b/src/lib/ector/cairo/meson.build
@@ -31,6 +31,9 @@ foreach eo_file : pub_eo_files
31 '-gchd', '@INPUT@']) 31 '-gchd', '@INPUT@'])
32endforeach 32endforeach
33 33
34install_data(pub_eo_files, 34
35 install_dir: join_paths(eolian_include_dir, package_version_name) 35if get_option('install-eo-files')
36) 36 install_data(pub_eo_files,
37 install_dir: join_paths(eolian_include_dir, package_version_name)
38 )
39endif
diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build
index 071e98eaee..ab87d79b4d 100644
--- a/src/lib/ector/gl/meson.build
+++ b/src/lib/ector/gl/meson.build
@@ -34,6 +34,9 @@ foreach eo_file : pub_eo_files
34 '-gchd', '@INPUT@']) 34 '-gchd', '@INPUT@'])
35endforeach 35endforeach
36 36
37install_data(pub_eo_files, 37
38 install_dir: join_paths(eolian_include_dir, package_version_name) 38if get_option('install-eo-files')
39) 39 install_data(pub_eo_files,
40 install_dir: join_paths(eolian_include_dir, package_version_name)
41 )
42endif
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index 5b86466873..069e98d9e7 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -55,9 +55,11 @@ pub_eo_types_files = [
55 'ector_types.eot' 55 'ector_types.eot'
56] 56]
57 57
58install_data(ector_pub_eo_files + pub_eo_types_files, 58if get_option('install-eo-files')
59 install_dir: join_paths(eolian_include_dir, package_version_name) 59 install_data(ector_pub_eo_files + pub_eo_types_files,
60) 60 install_dir: join_paths(eolian_include_dir, package_version_name)
61 )
62endif
61 63
62foreach eo_file : pub_eo_types_files 64foreach eo_file : pub_eo_types_files
63 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 65 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
diff --git a/src/lib/ector/software/meson.build b/src/lib/ector/software/meson.build
index 1484553374..2dff5be26c 100644
--- a/src/lib/ector/software/meson.build
+++ b/src/lib/ector/software/meson.build
@@ -45,6 +45,9 @@ if cpu_sse3 == true
45 ector_opt_lib += [ ector_opt ] 45 ector_opt_lib += [ ector_opt ]
46endif 46endif
47 47
48install_data(pub_eo_files, 48
49 install_dir: join_paths(eolian_include_dir, package_version_name) 49if get_option('install-eo-files')
50) 50 install_data(pub_eo_files,
51 install_dir: join_paths(eolian_include_dir, package_version_name)
52 )
53endif
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index c45dced7f8..23d93ce27e 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -158,9 +158,12 @@ edje = declare_dependency(
158 dependencies: edje_pub_deps, 158 dependencies: edje_pub_deps,
159) 159)
160 160
161install_data(pub_eo_files + pub_eo_types_files, 161
162 install_dir: join_paths(eolian_include_dir, package_version_name) 162if get_option('install-eo-files')
163) 163 install_data(pub_eo_files + pub_eo_types_files,
164 install_dir: join_paths(eolian_include_dir, package_version_name)
165 )
166endif
164 167
165install_headers(edje_header_src, 168install_headers(edje_header_src,
166 install_dir : dir_package_include, 169 install_dir : dir_package_include,
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 1c63bb327d..ef75b3d7ff 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -138,9 +138,11 @@ foreach eo_file : pub_eo_types_files
138 '-ghd', '@INPUT@']) 138 '-ghd', '@INPUT@'])
139endforeach 139endforeach
140 140
141install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files, 141if get_option('install-eo-files')
142 install_dir: join_paths(eolian_include_dir, package_version_name) 142 install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
143) 143 install_dir: join_paths(eolian_include_dir, package_version_name)
144 )
145endif
144 146
145efl_interfaces_eo_files = pub_eo_files 147efl_interfaces_eo_files = pub_eo_files
146efl_interfaces_eot_files = pub_eo_types_files 148efl_interfaces_eot_files = pub_eo_types_files
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index ec113fcd14..f95a1e652c 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -83,9 +83,12 @@ eio = declare_dependency(
83 dependencies: eio_pub_deps, 83 dependencies: eio_pub_deps,
84) 84)
85 85
86install_data(pub_eo_files + pub_eo_types_files, 86
87 install_dir: join_paths(eolian_include_dir, package_version_name) 87if get_option('install-eo-files')
88) 88 install_data(pub_eo_files + pub_eo_types_files,
89 install_dir: join_paths(eolian_include_dir, package_version_name)
90 )
91endif
89 92
90install_headers(eio_header_src, 93install_headers(eio_header_src,
91 install_dir : dir_package_include, 94 install_dir : dir_package_include,
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index 1fd852fcb3..de9902757d 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -109,9 +109,12 @@ eldbus = declare_dependency(
109 dependencies: eldbus_pub_deps, 109 dependencies: eldbus_pub_deps,
110) 110)
111 111
112install_data(pub_eo_files + pub_eo_types_files, 112
113 install_dir: join_paths(eolian_include_dir, package_version_name) 113if get_option('install-eo-files')
114) 114 install_data(pub_eo_files + pub_eo_types_files,
115 install_dir: join_paths(eolian_include_dir, package_version_name)
116 )
117endif
115 118
116install_headers(eldbus_header_src, 119install_headers(eldbus_header_src,
117 install_dir : dir_package_include, 120 install_dir : dir_package_include,
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 64698b6b26..4f3b3b7d4b 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1013,9 +1013,12 @@ elementary = declare_dependency(
1013 dependencies: elementary_pub_deps, 1013 dependencies: elementary_pub_deps,
1014) 1014)
1015 1015
1016install_data(pub_eo_files + pub_eo_types_files, 1016
1017 install_dir: join_paths(eolian_include_dir, package_version_name) 1017if get_option('install-eo-files')
1018) 1018 install_data(pub_eo_files + pub_eo_types_files,
1019 install_dir: join_paths(eolian_include_dir, package_version_name)
1020 )
1021endif
1019 1022
1020install_headers(elementary_header_src, 1023install_headers(elementary_header_src,
1021 install_dir : dir_package_include, 1024 install_dir : dir_package_include,
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index 93218828b3..6f2717dfa6 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -1,11 +1,11 @@
1pub_legacy_eo_files = [ 1pub_eo_file = [
2 'efl_canvas_video.eo' 2 'efl_canvas_video.eo'
3] 3]
4 4
5pub_eo_file_target = [] 5pub_eo_file_target = []
6priv_eo_file_target = [] 6priv_eo_file_target = []
7 7
8foreach eo_file : pub_legacy_eo_files 8foreach eo_file : pub_eo_file
9 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 9 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
10 input : eo_file, 10 input : eo_file,
11 output : [eo_file + '.h'], 11 output : [eo_file + '.h'],
@@ -62,9 +62,11 @@ emotion = declare_dependency(
62 dependencies: emotion_pub_deps, 62 dependencies: emotion_pub_deps,
63) 63)
64 64
65install_data(pub_legacy_eo_files, 65if get_option('install-eo-files')
66 install_dir: join_paths(eolian_include_dir, package_version_name) 66 install_data(pub_eo_file,
67) 67 install_dir: join_paths(eolian_include_dir, package_version_name)
68 )
69endif
68 70
69install_headers(emotion_header_src, 71install_headers(emotion_header_src,
70 install_dir : dir_package_include, 72 install_dir : dir_package_include,
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 1e344293ef..abc563ff60 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -72,9 +72,11 @@ eo_dbg = declare_dependency(
72 dependencies: eo_deps + eo_pub_deps, 72 dependencies: eo_deps + eo_pub_deps,
73) 73)
74 74
75install_data(pub_eo_files + pub_eo_types_files, 75if get_option('install-eo-files')
76 install_dir: join_paths(eolian_include_dir, package_version_name) 76 install_data(pub_eo_files + pub_eo_types_files,
77) 77 install_dir: join_paths(eolian_include_dir, package_version_name)
78 )
79endif
78 80
79install_headers(eo_header, 81install_headers(eo_header,
80 install_dir : dir_package_include, 82 install_dir : dir_package_include,
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 1b306c363e..df5f585f5e 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -202,9 +202,11 @@ evas_pre_lib_dep = declare_dependency(
202 dependencies: [evas_deps, m, draw, valgrind, libunibreak] 202 dependencies: [evas_deps, m, draw, valgrind, libunibreak]
203) 203)
204 204
205install_data(pub_evas_eo_files + pub_evas_eot_files, 205if get_option('install-eo-files')
206 install_dir: join_paths(eolian_include_dir, package_version_name) 206 install_data(pub_evas_eo_files + pub_evas_eot_files,
207) 207 install_dir: join_paths(eolian_include_dir, package_version_name)
208 )
209endif
208 210
209install_headers(evas_header_src, 211install_headers(evas_header_src,
210 install_dir : dir_package_include, 212 install_dir : dir_package_include,