This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/81/head
in repository efl.
View the commit online.
commit f466d215ab4bdf116583e8b6398433d04582d968
Author: Vincent Torri <vto...@outlook.fr>
AuthorDate: Wed Mar 12 21:25:11 2025 +0100
update minimal version of meson to 0.60. Fix also some warnings
---
dbus-services/meson.build | 2 +-
doc/meson.build | 8 ++++----
meson.build | 4 ++--
src/bin/exactness/meson.build | 4 ++--
src/bindings/mono/meson.build | 2 +-
src/lib/efl/interfaces/meson.build | 2 +-
src/lib/elementary/meson.build | 4 ++--
src/lib/evas/meson.build | 8 ++++----
src/modules/evas/image_loaders/meson.build | 2 +-
src/modules/evas/image_savers/meson.build | 2 +-
src/static_libs/buildsystem/meson.build | 2 +-
src/tests/edje/data/meson.build | 2 +-
src/tests/edje/tests/meson.build | 2 +-
src/tests/elementary/meson.build | 4 ++--
src/tests/elementary/spec/meson.build | 2 +-
src/tests/elua/meson.build | 8 ++++----
src/tests/eolian/meson.build | 2 +-
src/tests/eolian_cxx/meson.build | 2 +-
18 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/dbus-services/meson.build b/dbus-services/meson.build
index 29fe392411..e8faa851d6 100644
--- a/dbus-services/meson.build
+++ b/dbus-services/meson.build
@@ -15,4 +15,4 @@ configure_file(
input: 'org.enlightenment.Ethumb.service.in',
output: 'org.enlightenment.Ethumb.service',
configuration: org_enlightenment_ethumb_service_config,
- install_dir: dep.get_pkgconfig_variable('session_bus_services_dir'))
+ install_dir: dep.get_variable(pkgconfig : 'session_bus_services_dir'))
diff --git a/doc/meson.build b/doc/meson.build
index 5ad389828c..185bdc02c8 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -109,12 +109,12 @@ foreach text_filter_property : text_filter_properties
font = text_filter_property[1]
size = text_filter_property[2]
name = text_filter_property[3]
- filter_code = run_command('cat', join_paths(meson.source_root(), 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'))
+ filter_code = run_command('cat', join_paths(meson.project_source_root(), 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'))
doc_target += custom_target('preview_text_filters_'+name,
command: [
env, 'EFL_RUN_IN_TREE=1',
- 'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.source_root(), 'src', 'lib', 'evas'),
+ 'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.project_source_root(), 'src', 'lib', 'evas'),
preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size
],
depends: preview_text_filter,
@@ -132,7 +132,7 @@ foreach widget_preview : widget_previews
dependencies: elementary,
build_by_default: false,
c_args : [
- '-DPACKAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
+ '-DPACKAGE_DATA_DIR="'+join_paths(meson.project_source_root(), 'data', 'elementary')+'"',
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
'-DDOCW_DIR="'+meson.current_build_dir()+'"']
@@ -196,7 +196,7 @@ doxyfile_conf = configuration_data()
doxyfile_conf.merge_from(config_h)
doxyfile_conf.set('srcdir', meson.current_source_dir())
doxyfile_conf.set('top_builddir', meson.build_root())
-doxyfile_conf.set('top_srcdir', meson.source_root())
+doxyfile_conf.set('top_srcdir', meson.project_source_root())
configure_file(
input: 'Doxyfile.in',
diff --git a/meson.build b/meson.build
index 8a065deb16..d3d651e0c3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('efl', ['c','cpp'],
version: '1.28.99',
default_options : ['buildtype=plain', 'warning_level=1', 'cpp_std=c++11'],
- meson_version : '>=0.50'
+ meson_version : '>=0.60'
)
if host_machine.system() == 'darwin'
@@ -141,7 +141,7 @@ config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
-config_h.set_quoted('PACKAGE_SRC_DIR', meson.source_root())
+config_h.set_quoted('PACKAGE_SRC_DIR', meson.project_source_root())
config_h.set_quoted('PACKAGE_BUILD_DIR', meson.current_build_dir())
config_h.set_quoted('PACKAGE_SYSCONF_DIR', dir_sysconf)
config_h.set_quoted('BINDIR', dir_bin)
diff --git a/src/bin/exactness/meson.build b/src/bin/exactness/meson.build
index 4d048f18c9..69010d7da1 100644
--- a/src/bin/exactness/meson.build
+++ b/src/bin/exactness/meson.build
@@ -25,8 +25,8 @@ edjs = custom_target('player_entry',
install : true,
install_dir : 'share/exactness',
command : edje_cc_exe + [
- '-id', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'img'),
- '-sd', join_paths(meson.source_root(), 'data', 'elementary', 'themes', 'snd'),
+ '-id', join_paths(meson.project_source_root(), 'data', 'elementary', 'themes', 'img'),
+ '-sd', join_paths(meson.project_source_root(), 'data', 'elementary', 'themes', 'snd'),
'@INPUT@', '@OUTPUT@'],
depends : edje_depends)
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index 111eb911ea..f664d466da 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -299,7 +299,7 @@ else
cs_args : extra_cs_args + ['-doc:' + efl_mono_xml_doc, '-warnaserror+'],
)
- meson.add_install_script(join_paths(meson.source_root(), 'meson', 'meson_csharp_docs.sh'),
+ meson.add_install_script(join_paths(meson.project_source_root(), 'meson', 'meson_csharp_docs.sh'),
efl_mono_xml_doc,
efl_mono_install_dir)
endif
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 0b1bdd4556..22be8cd01d 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -1,4 +1,4 @@
-eolian_include_directories += ['-I', join_paths(meson.source_root(), 'src', 'lib')]
+eolian_include_directories += ['-I', join_paths(meson.project_source_root(), 'src', 'lib')]
pub_legacy_eo_files = [
'efl_gfx_fill.eo',
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 5f3aa4720a..de40d9cf87 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -261,7 +261,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
embed_script = find_program('config_embed')
embed_config = custom_target('create_embedded_default_config',
- input: join_paths(meson.source_root(), 'data', 'elementary', 'config', 'standard', 'base.src.in'),
+ input: join_paths(meson.project_source_root(), 'data', 'elementary', 'config', 'standard', 'base.src.in'),
output: 'elm_default_config.x',
command: [embed_script, '@INPUT@', '@OUTPUT@']
)
@@ -955,7 +955,7 @@ elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_inp
elementary_ext_deps = [atspi, dl, intl, buildsystem_simple]
elm_options = configuration_data()
-config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
+config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.project_build_root())
config_h.set_quoted('MODULES_PATH', join_paths(dir_lib, 'modules'))
config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('elementary-base-dir'))
config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons'))
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 03bc02aa95..7b193c0109 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -261,7 +261,7 @@ foreach loader_inst : evas_image_loaders_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'static'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
evas_static_list += [declare_dependency(
sources: file,
@@ -280,7 +280,7 @@ foreach loader_inst : evas_image_savers_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'static'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
evas_static_list += [declare_dependency(
sources: file,
@@ -297,7 +297,7 @@ foreach loader_inst : evas_vg_loaders_file
loader_deps = loader_inst[1]
if (get_option('evas-loaders-disabler').contains(loader) == false)
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
evas_static_list += [declare_dependency(
sources: file,
dependencies: loader_deps,
@@ -308,7 +308,7 @@ endforeach
foreach loader : evas_vg_savers_file
if (get_option('evas-loaders-disabler').contains(loader) == false)
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
evas_static_list += [declare_dependency(
sources: file,
dependencies: [eo, ector, emile, freetype, eet],
diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build
index 11b11f79c2..64482d0e93 100644
--- a/src/modules/evas/image_loaders/meson.build
+++ b/src/modules/evas/image_loaders/meson.build
@@ -5,7 +5,7 @@ foreach loader_inst : evas_image_loaders_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'shared'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
mod_install_dir = join_paths(evas_package_modules, 'image_loaders', loader, version_name)
shared_module('shared_loader_'+loader, file,
diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build
index e30a05fe3b..932c65963d 100644
--- a/src/modules/evas/image_savers/meson.build
+++ b/src/modules/evas/image_savers/meson.build
@@ -5,7 +5,7 @@ foreach loader_inst : evas_image_savers_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'shared'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
+ file = join_paths(meson.project_source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
evas_package_modules = join_paths(dir_lib, 'evas', 'modules')
mod_install_dir = join_paths(evas_package_modules, 'image_savers', loader, version_name)
shared_module('shared_saver_'+loader, file,
diff --git a/src/static_libs/buildsystem/meson.build b/src/static_libs/buildsystem/meson.build
index dd3b1f6dab..435b6a2944 100644
--- a/src/static_libs/buildsystem/meson.build
+++ b/src/static_libs/buildsystem/meson.build
@@ -10,7 +10,7 @@ buildsystem_lib = static_library('buildsystem',
dependencies : [eina, efl],
include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
install: false,
- c_args : ['-DPACKAGE_SRC_DIR="'+ meson.source_root() +'"'],
+ c_args : ['-DPACKAGE_SRC_DIR="'+ meson.project_source_root() +'"'],
)
buildsystem = declare_dependency(
diff --git a/src/tests/edje/data/meson.build b/src/tests/edje/data/meson.build
index 2148b861dc..c70f7755d5 100644
--- a/src/tests/edje/data/meson.build
+++ b/src/tests/edje/data/meson.build
@@ -26,7 +26,7 @@ foreach edc_file : edc_files
input : edc_file,
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
+ '-id', join_paths(meson.project_source_root(), 'src', 'tests', 'emotion', 'data'),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
'-vd', meson.current_source_dir(),
diff --git a/src/tests/edje/tests/meson.build b/src/tests/edje/tests/meson.build
index 3d3f4313ad..889a9f51b3 100644
--- a/src/tests/edje/tests/meson.build
+++ b/src/tests/edje/tests/meson.build
@@ -7,7 +7,7 @@ foreach edc_file : edc_files
input : edc_file,
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
+ '-id', join_paths(meson.project_source_root(), 'src', 'tests', 'emotion', 'data'),
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
'-vd', meson.current_source_dir(),
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 90249fda9d..cefd55d9d3 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -113,7 +113,7 @@ elementary_suite = executable('elementary_suite',
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
+ '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.project_source_root(), 'data', 'elementary')+'"',
'-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
]
)
@@ -177,7 +177,7 @@ efl_ui_suite = executable('efl_ui_suite',
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
+ '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.project_source_root(), 'data', 'elementary')+'"',
'-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
]
)
diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build
index 2ec21f5908..95cf89d275 100644
--- a/src/tests/elementary/spec/meson.build
+++ b/src/tests/elementary/spec/meson.build
@@ -38,7 +38,7 @@ efl_ui_behavior_suite = executable('efl_ui_spec_suite',
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
+ '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.project_source_root(), 'data', 'elementary')+'"',
'-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
]
)
diff --git a/src/tests/elua/meson.build b/src/tests/elua/meson.build
index fc6829ce71..311a5440ed 100644
--- a/src/tests/elua/meson.build
+++ b/src/tests/elua/meson.build
@@ -6,10 +6,10 @@ elua_suite_src = [
'elua_lib.c'
]
-elua_bindings_dir = join_paths(meson.source_root(), 'src', 'bindings', 'lua')
-elua_core_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'core')
-elua_modules_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'modules')
-elua_apps_dir = join_paths(meson.source_root(), 'src', 'tests', 'elua', 'data', 'apps')
+elua_bindings_dir = join_paths(meson.project_source_root(), 'src', 'bindings', 'lua')
+elua_core_dir = join_paths(meson.project_source_root(), 'src', 'scripts', 'elua', 'core')
+elua_modules_dir = join_paths(meson.project_source_root(), 'src', 'scripts', 'elua', 'modules')
+elua_apps_dir = join_paths(meson.project_source_root(), 'src', 'tests', 'elua', 'data', 'apps')
elua_suite = executable('elua_suite',
elua_suite_src,
diff --git a/src/tests/eolian/meson.build b/src/tests/eolian/meson.build
index cd9c4f185f..90f8f8d292 100644
--- a/src/tests/eolian/meson.build
+++ b/src/tests/eolian/meson.build
@@ -32,7 +32,7 @@ eolian_suite = executable('eolian_suite',
c_args : [
'-DEOLIAN_GEN="'+eolian_gen_path+'"',
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"',
+ '-DEO_SRC_DIR="'+join_paths(meson.project_source_root(), 'src', 'lib')+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
)
diff --git a/src/tests/eolian_cxx/meson.build b/src/tests/eolian_cxx/meson.build
index 9e0fbb366e..a5b784d12c 100644
--- a/src/tests/eolian_cxx/meson.build
+++ b/src/tests/eolian_cxx/meson.build
@@ -65,7 +65,7 @@ eolian_cxx_suite = executable('eolian_cxx_suite',
# package_c_args contains -D definitions for the package
cpp_args : package_c_args +[
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"',
+ '-DEO_SRC_DIR="'+join_paths(meson.project_source_root(), 'src', 'lib')+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
