From cbd278dbda21af37ad46f3c5f8a5289378392be7 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 14 Mar 2019 12:43:51 -0400 Subject: [PATCH] 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 --- meson_options.txt | 6 ++++++ src/lib/ecore/meson.build | 8 +++++--- src/lib/ecore_audio/meson.build | 8 +++++--- src/lib/ecore_con/meson.build | 8 +++++--- src/lib/ector/cairo/meson.build | 9 ++++++--- src/lib/ector/gl/meson.build | 9 ++++++--- src/lib/ector/meson.build | 8 +++++--- src/lib/ector/software/meson.build | 9 ++++++--- src/lib/edje/meson.build | 9 ++++++--- src/lib/efl/interfaces/meson.build | 8 +++++--- src/lib/eio/meson.build | 9 ++++++--- src/lib/eldbus/meson.build | 9 ++++++--- src/lib/elementary/meson.build | 9 ++++++--- src/lib/emotion/meson.build | 12 +++++++----- src/lib/eo/meson.build | 8 +++++--- src/lib/evas/meson.build | 8 +++++--- 16 files changed, 90 insertions(+), 47 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 0ec15b6..5702b8a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -378,3 +378,9 @@ option('tizen_audio', value: true, description: 'enable tizen audio' ) + +option('install-eo-files', + type: 'boolean', + value: false, + description : 'Set this to false to not install any eo file' +) diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index f0a8cf2..71a29b4 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -226,9 +226,11 @@ ecore = declare_dependency( eolian_ecore_dir = join_paths(eolian_include_dir, package_version_name) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: eolian_ecore_dir -) +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: eolian_ecore_dir + ) +endif install_headers(ecore_header_src, install_dir : dir_package_include, diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build index 2c89c3d..eec6ccb 100644 --- a/src/lib/ecore_audio/meson.build +++ b/src/lib/ecore_audio/meson.build @@ -106,9 +106,11 @@ ecore_audio = declare_dependency( dependencies: ecore_audio_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: eolian_ecore_dir -) +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: eolian_ecore_dir + ) +endif install_headers(ecore_audio_header_src, install_dir : dir_package_include, diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build index d46a8cd..7439042 100644 --- a/src/lib/ecore_con/meson.build +++ b/src/lib/ecore_con/meson.build @@ -200,9 +200,11 @@ ecore_con = declare_dependency( dependencies: ecore_con_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: eolian_ecore_dir -) +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: eolian_ecore_dir + ) +endif install_headers(ecore_con_header_src, install_dir : dir_package_include, diff --git a/src/lib/ector/cairo/meson.build b/src/lib/ector/cairo/meson.build index 123ea90..094aedb 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 '-gchd', '@INPUT@']) endforeach -install_data(pub_eo_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build index 071e98e..ab87d79 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 '-gchd', '@INPUT@']) endforeach -install_data(pub_eo_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build index 5b86466..069e98d 100644 --- a/src/lib/ector/meson.build +++ b/src/lib/ector/meson.build @@ -55,9 +55,11 @@ pub_eo_types_files = [ 'ector_types.eot' ] -install_data(ector_pub_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) +if get_option('install-eo-files') + install_data(ector_pub_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif foreach eo_file : pub_eo_types_files 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 1484553..2dff5be 100644 --- a/src/lib/ector/software/meson.build +++ b/src/lib/ector/software/meson.build @@ -45,6 +45,9 @@ if cpu_sse3 == true ector_opt_lib += [ ector_opt ] endif -install_data(pub_eo_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build index c45dced..23d93ce 100644 --- a/src/lib/edje/meson.build +++ b/src/lib/edje/meson.build @@ -158,9 +158,12 @@ edje = declare_dependency( dependencies: edje_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(edje_header_src, install_dir : dir_package_include, diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index 1c63bb3..ef75b3d 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 '-ghd', '@INPUT@']) endforeach -install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) +if get_option('install-eo-files') + install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif efl_interfaces_eo_files = pub_eo_files efl_interfaces_eot_files = pub_eo_types_files diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build index ec113fc..f95a1e6 100644 --- a/src/lib/eio/meson.build +++ b/src/lib/eio/meson.build @@ -83,9 +83,12 @@ eio = declare_dependency( dependencies: eio_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(eio_header_src, install_dir : dir_package_include, diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build index 1fd852f..de99027 100644 --- a/src/lib/eldbus/meson.build +++ b/src/lib/eldbus/meson.build @@ -109,9 +109,12 @@ eldbus = declare_dependency( dependencies: eldbus_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(eldbus_header_src, install_dir : dir_package_include, diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 413082b..cc86f06 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1105,9 +1105,12 @@ elementary = declare_dependency( dependencies: elementary_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) + +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(elementary_header_src, install_dir : dir_package_include, diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build index 9321882..6f2717d 100644 --- a/src/lib/emotion/meson.build +++ b/src/lib/emotion/meson.build @@ -1,11 +1,11 @@ -pub_legacy_eo_files = [ +pub_eo_file = [ 'efl_canvas_video.eo' ] pub_eo_file_target = [] priv_eo_file_target = [] -foreach eo_file : pub_legacy_eo_files +foreach eo_file : pub_eo_file pub_eo_file_target += custom_target('eolian_gen_' + eo_file, input : eo_file, output : [eo_file + '.h'], @@ -62,9 +62,11 @@ emotion = declare_dependency( dependencies: emotion_pub_deps, ) -install_data(pub_legacy_eo_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) +if get_option('install-eo-files') + install_data(pub_eo_file, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(emotion_header_src, install_dir : dir_package_include, diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build index 1e34429..abc563f 100644 --- a/src/lib/eo/meson.build +++ b/src/lib/eo/meson.build @@ -72,9 +72,11 @@ eo_dbg = declare_dependency( dependencies: eo_deps + eo_pub_deps, ) -install_data(pub_eo_files + pub_eo_types_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) +if get_option('install-eo-files') + install_data(pub_eo_files + pub_eo_types_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(eo_header, install_dir : dir_package_include, diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index 27e910d..1d7a33c 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -210,9 +210,11 @@ evas_pre_lib_dep = declare_dependency( dependencies: [evas_deps, m, draw, valgrind, libunibreak] ) -install_data(pub_evas_eo_files + pub_evas_eot_files, - install_dir: join_paths(eolian_include_dir, package_version_name) -) +if get_option('install-eo-files') + install_data(pub_evas_eo_files + pub_evas_eot_files, + install_dir: join_paths(eolian_include_dir, package_version_name) + ) +endif install_headers(evas_header_src, install_dir : dir_package_include, -- 2.7.4