bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8cb311357c6473d4848636e6881be37926f5ed7c
commit 8cb311357c6473d4848636e6881be37926f5ed7c Author: Marcel Hollerbach <[email protected]> Date: Tue Apr 7 13:19:10 2020 +0200 meson: do not install namespace problem legacy files these files are not required for the unified API, but they have namespace problems, so for now, do not install them Differential Revision: https://phab.enlightenment.org/D11665 --- src/lib/ecore_audio/meson.build | 13 ++++++++----- src/lib/ector/gl/meson.build | 14 ++++++++------ src/lib/ector/meson.build | 13 ++++++++----- src/lib/ector/software/meson.build | 13 ++++++++----- src/lib/eldbus/meson.build | 14 ++++++++------ 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build index cbcaca4931..c03eb3e663 100644 --- a/src/lib/ecore_audio/meson.build +++ b/src/lib/ecore_audio/meson.build @@ -92,11 +92,14 @@ ecore_audio = declare_dependency( dependencies: ecore_audio_pub_deps, ) -if get_option('install-eo-files') - install_data(pub_eo_files + pub_eo_types_files, - install_dir: eolian_ecore_dir - ) -endif +# +# Only enable that again when the namespace problems are fixed. ref T8648 +# +#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/ector/gl/meson.build b/src/lib/ector/gl/meson.build index ab87d79b4d..4bb792c3a7 100644 --- a/src/lib/ector/gl/meson.build +++ b/src/lib/ector/gl/meson.build @@ -34,9 +34,11 @@ foreach eo_file : pub_eo_files '-gchd', '@INPUT@']) endforeach - -if get_option('install-eo-files') - install_data(pub_eo_files, - install_dir: join_paths(eolian_include_dir, package_version_name) - ) -endif +# +# Only enable that again when the namespace problems are fixed. ref T8648 +# +#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 b0d33a1d42..49fc5a477f 100644 --- a/src/lib/ector/meson.build +++ b/src/lib/ector/meson.build @@ -56,11 +56,14 @@ pub_eo_types_files = [ 'ector_types.eot' ] -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 +# +# Only enable that again when the namespace problems are fixed. ref T8648 +# +#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 7374252729..75d217142a 100644 --- a/src/lib/ector/software/meson.build +++ b/src/lib/ector/software/meson.build @@ -48,8 +48,11 @@ if cpu_sse3 == true endif -if get_option('install-eo-files') - install_data(pub_eo_files, - install_dir: join_paths(eolian_include_dir, package_version_name) - ) -endif +# +# Only enable that again when the namespace problems are fixed. ref T8648 +# +#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/eldbus/meson.build b/src/lib/eldbus/meson.build index de9902757d..054273acf8 100644 --- a/src/lib/eldbus/meson.build +++ b/src/lib/eldbus/meson.build @@ -109,12 +109,14 @@ eldbus = declare_dependency( dependencies: eldbus_pub_deps, ) - -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 +# +# Only enable that again when the namespace problems are fixed. ref T8648 +# +#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, --
