From d630663df86b4352017f14d5d12e979808438e7f Mon Sep 17 00:00:00 2001 From: Dimmus Date: Thu, 9 Jun 2022 12:25:53 +0500 Subject: [PATCH] meson: changed deprecated since 0.56 function build_root() to current_build_dir() --- doc/meson.build | 6 +++--- src/bindings/mono/meson.build | 2 +- src/lib/elementary/meson.build | 2 +- src/tests/efl_mono/meson.build | 2 +- src/tests/elementary/meson.build | 4 ++-- src/tests/elementary/spec/meson.build | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 5ad389828c..5dc3b8262b 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -152,7 +152,7 @@ foreach widget_preview : widget_previews widget_executable = get_variable(binary) - screen_shot_dir = join_paths(meson.build_root(), 'html', 'img', 'widget', directory) + screen_shot_dir = join_paths(meson.current_build_dir(), 'html', 'img', 'widget', directory) create_preview = custom_target('widget_preview_'+('_'.join([directory, ss, x, y])), command: [shot_sh, screen_shot_dir, ss, widget_executable.full_path(), x, y], @@ -181,7 +181,7 @@ doc_target += custom_target('doxygen', ) compress_target = custom_target('package_doc_tar', - command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'], + command: [tar, '-C', meson.current_build_dir(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'], output: 'efl-'+meson.project_version()+'-doc.tar.xz', depends: [doc_target], build_by_default: false @@ -195,7 +195,7 @@ run_target('doc', 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_builddir', meson.current_build_dir()) doxyfile_conf.set('top_srcdir', meson.source_root()) configure_file( diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build index 74f2d06de7..b325179675 100644 --- a/src/bindings/mono/meson.build +++ b/src/bindings/mono/meson.build @@ -223,7 +223,7 @@ if (get_option('dotnet')) lib_csproj_conf_data.set('NETSTANDARD_VERSION', dotnet_standard_version) lib_csproj_conf_data.set('BINDING_SRC', meson.current_source_dir()) - lib_csproj_conf_data.set('CA_RULESET', join_paths(meson.build_root(), '@0@'.format(ca_ruleset))) + lib_csproj_conf_data.set('CA_RULESET', join_paths(meson.current_build_dir(), '@0@'.format(ca_ruleset))) lib_csproj_conf_data.set('EFL_VERSION', meson.project_version()) if get_option('mono-beta') diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 09e5596e3a..1cc93ad1b3 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -954,7 +954,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.current_build_dir()) 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/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build index 9c715893df..dd799269ba 100644 --- a/src/tests/efl_mono/meson.build +++ b/src/tests/efl_mono/meson.build @@ -94,7 +94,7 @@ if get_option('dotnet') dotnet_test_conf_data.set('BINDING_BUILD', join_paths(meson.current_build_dir(), '..', '..', 'bindings', 'mono')) dotnet_test_conf_data.set('BINDING_TEST_SRC', meson.current_source_dir()) - dotnet_test_conf_data.set('CA_RULESET', join_paths(meson.build_root(), '@0@'.format(ca_ruleset))) + dotnet_test_conf_data.set('CA_RULESET', join_paths(meson.current_build_dir(), '@0@'.format(ca_ruleset))) dotnet_test_conf_data.set('NETCOREAPP_VERSION', dotnet_core_app_version) diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build index 273ee418dc..a11eab7b30 100644 --- a/src/tests/elementary/meson.build +++ b/src/tests/elementary/meson.build @@ -114,7 +114,7 @@ elementary_suite = executable('elementary_suite', '-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_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"', + '-DELM_TEST_DATA_DIR="'+join_paths(meson.current_build_dir(), 'data', 'elementary')+'"', ] ) @@ -178,7 +178,7 @@ efl_ui_suite = executable('efl_ui_suite', '-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_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"', + '-DELM_TEST_DATA_DIR="'+join_paths(meson.current_build_dir(), 'data', 'elementary')+'"', ] ) diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build index e0a5a3c86d..06c7819526 100644 --- a/src/tests/elementary/spec/meson.build +++ b/src/tests/elementary/spec/meson.build @@ -39,7 +39,7 @@ efl_ui_behavior_suite = executable('efl_ui_spec_suite', '-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_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"', + '-DELM_TEST_DATA_DIR="'+join_paths(meson.current_build_dir(), 'data', 'elementary')+'"', ] )