meson: Replace meson.build_root() with meson.project_build_root()

The build_root() method is deprecated in 0.56.0 and we're
recommended to use project_build_root() instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/build-aux/meson.build b/build-aux/meson.build
index fcd231a386fa2968567329ff47047fa95e709e71..6017f07c0aea0cd716537f074a6f81efe4aa9ccc 100644 (file)
--- a/build-aux/meson.build
+++ b/build-aux/meson.build
@@ -30,7 +30,7 @@ awk_prog = find_program('awk')
 
 syntax_check_conf = configuration_data({
   'top_srcdir': meson.source_root(),
-  'top_builddir': meson.build_root(),
+  'top_builddir': meson.project_build_root(),
   'flake8_path': flake8_path,
   'runutf8': ' '.join(runutf8),
   'PYTHON3': python3_prog.path(),

diff --git a/docs/go/meson.build b/docs/go/meson.build
index c0e19c41823a42b4120784e0dbd362349084ba5e..29467c61f09c5b632d9b754b4a86f9063d97b1cd 100644 (file)
--- a/docs/go/meson.build
+++ b/docs/go/meson.build
@@ -31,7 +31,7 @@ foreach data : html_xslt_gen
     command: [
       xsltproc_prog,
       '--stringparam', 'pagesrc', data.get('source', ''),
-      '--stringparam', 'builddir', meson.build_root(),
+      '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
       '--stringparam', 'href_base', data.get('href_base', ''),
       '--nonet',

diff --git a/docs/html/meson.build b/docs/html/meson.build
index e194b5942c264e0f019cfd1e90fc3e027cbed403..b0ca400d080f2d3d3039973def0cd8cbd389a143 100644 (file)
--- a/docs/html/meson.build
+++ b/docs/html/meson.build
@@ -39,7 +39,7 @@ index_api_gen = custom_target(
   ],
   command: [
     xsltproc_prog, '--nonet', '-o', docs_builddir,
-    '--stringparam', 'builddir', meson.build_root(),
+    '--stringparam', 'builddir', meson.project_build_root(),
     '--stringparam', 'timestamp', docs_timestamp,
     '@INPUT@',
   ],
@@ -66,7 +66,7 @@ foreach name : [ 'admin', 'lxc', 'qemu' ]
     ],
     command: [
       xsltproc_prog, '--nonet', '-o', docs_builddir,
-      '--stringparam', 'builddir', meson.build_root(),
+      '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
       '--stringparam', 'indexfile', 'index-@0@.html'.format(name),
       '@INPUT@',

diff --git a/docs/kbase/internals/meson.build b/docs/kbase/internals/meson.build
index a16d5a290b730cbe6134128ff3bebd2c27fc4c8a..f1e9122f8fa5ba959b12ab8f54732ca09fddb0a9 100644 (file)
--- a/docs/kbase/internals/meson.build
+++ b/docs/kbase/internals/meson.build
@@ -40,7 +40,7 @@ foreach data : html_xslt_gen
     command: [
       xsltproc_prog,
       '--stringparam', 'pagesrc', data.get('source', ''),
-      '--stringparam', 'builddir', meson.build_root(),
+      '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
       '--stringparam', 'href_base', data.get('href_base', ''),
       '--nonet',

diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
index c7eae3738fc1783f7131e44c7917aa0f558a6a7d..5b608293e27c6157481dab5b55e63ad5ed5b4e58 100644 (file)
--- a/docs/kbase/meson.build
+++ b/docs/kbase/meson.build
@@ -50,7 +50,7 @@ foreach data : html_xslt_gen
     command: [
       xsltproc_prog,
       '--stringparam', 'pagesrc', data.get('source', ''),
-      '--stringparam', 'builddir', meson.build_root(),
+      '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
       '--stringparam', 'href_base', data.get('href_base', ''),
       '--nonet',

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index 83933227d9c950a4596f9dcd0076cc1b18a511e7..b5556996a42977898adaf6813196c7a5d63bc87e 100644 (file)
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -148,7 +148,7 @@ foreach data : html_xslt_gen
     command: [
       xsltproc_prog,
       '--stringparam', 'pagesrc', data.get('source', ''),
-      '--stringparam', 'builddir', meson.build_root(),
+      '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
       '--stringparam', 'href_base', data.get('href_base', ''),
       '--nonet',

diff --git a/docs/meson.build b/docs/meson.build
index 39c60f90343f28f6adc9fdc0717f80d676563596..2b292b1a5ad5feb2327e5f2badf5bfa3194a6484 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -264,7 +264,7 @@ hvsupport_html_in = custom_target(
     python3_prog,
     hvsupport_prog,
     meson.source_root(),
-    meson.build_root(),
+    meson.project_build_root(),
   ],
   capture: true,
   depend_files: [
@@ -305,7 +305,7 @@ foreach data : html_xslt_gen
     command: [
       xsltproc_prog,
       '--stringparam', 'pagesrc', data.get('source', ''),
-      '--stringparam', 'builddir', meson.build_root(),
+      '--stringparam', 'builddir', meson.project_build_root(),
       '--stringparam', 'timestamp', docs_timestamp,
       '--stringparam', 'href_base', data.get('href_base', ''),
       '--nonet',
@@ -360,7 +360,7 @@ test(
   args: [
     check_html_references_prog.path(),
     '--prefix',
-    meson.build_root() / 'docs'
+    meson.project_build_root() / 'docs'
   ],
   env: runutf8,
 )

diff --git a/meson.build b/meson.build
index 0f4650f4676ad7ed8025086c4e27fe1fb6a49496..b7a0e4726f2ea39ea4b502ba32e799a6b9ecda26 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ endif
 conf = configuration_data()
 
 conf.set('_GNU_SOURCE', 1)
-conf.set_quoted('abs_top_builddir', meson.build_root())
+conf.set_quoted('abs_top_builddir', meson.project_build_root())
 conf.set_quoted('abs_top_srcdir', meson.source_root())
 conf.set_quoted('PACKAGE', meson.project_name())
 conf.set_quoted('PACKAGE_NAME', meson.project_name())
@@ -2171,7 +2171,7 @@ if git
   foreach file : dist_files
     meson.add_dist_script(
       meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(),
-      meson.build_root(), file
+      meson.project_build_root(), file
     )
   endforeach
 endif
@@ -2183,8 +2183,8 @@ configure_file(output: 'meson-config.h', configuration: conf)
 
 # generate run helper
 run_conf = configuration_data({
-  'abs_builddir': meson.build_root(),
-  'abs_top_builddir': meson.build_root(),
+  'abs_builddir': meson.project_build_root(),
+  'abs_top_builddir': meson.project_build_root(),
 })
 
 configure_file(

diff --git a/po/meson.build b/po/meson.build
index f5d05e2b31c401d54e6f70ec045ce02ce5682306..0f2a1bb6171aa6562597c1245589bbefa5974a8f 100644 (file)
--- a/po/meson.build
+++ b/po/meson.build
@@ -8,7 +8,7 @@ i18n.gettext(
     '--keyword=N_',
     '--add-comments=TRANSLATORS:',
     '--directory=@0@'.format(meson.source_root()),
-    '--directory=@0@'.format(meson.build_root()),
+    '--directory=@0@'.format(meson.project_build_root()),
     '--files-from=@0@'.format(meson.current_source_dir() / 'POTFILES'),
     '--msgid-bugs-address=https://libvirt.org/bugs.html',
     '--package-version=@0@'.format(meson.project_version()),

diff --git a/src/esx/meson.build b/src/esx/meson.build
index 5861e90afacb352ffe35fccbc2f5394708bcfdd2..2d05294ba109da28878c541374fe6338b274d2ac 100644 (file)
--- a/src/esx/meson.build
+++ b/src/esx/meson.build
@@ -27,7 +27,7 @@ esx_gen_headers = custom_target(
   command: [
     meson_python_prog, python3_prog, esx_vi_generator_prog,
     meson.source_root() / 'src',
-    meson.build_root() / 'src',
+    meson.project_build_root() / 'src',
     'header',
   ],
 )
@@ -48,7 +48,7 @@ esx_gen_sources = custom_target(
   command: [
     meson_python_prog, python3_prog, esx_vi_generator_prog,
     meson.source_root() / 'src',
-    meson.build_root() / 'src',
+    meson.project_build_root() / 'src',
     'source',
   ],
 )

diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build
index 0f0cdb9e54542ddafed0fb4de9f36b75a84ab99d..2589fc54378fcbe10b76187a05fc4a2a78ce4e0e 100644 (file)
--- a/src/hyperv/meson.build
+++ b/src/hyperv/meson.build
@@ -19,7 +19,7 @@ hyperv_gen_sources = custom_target(
   command: [
     meson_python_prog, python3_prog, hyperv_wmi_generator_prog,
     meson.source_root() / 'src',
-    meson.build_root() / 'src',
+    meson.project_build_root() / 'src',
   ],
 )
 

diff --git a/src/meson.build b/src/meson.build
index 88a6f15760ecb6c5c4f072e29ed28d0b48f242eb..80007967339b1734e60f93affbcbe8430904b51f 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,7 +3,7 @@ src_inc_dir = include_directories('.')
 src_dep = declare_dependency(
   compile_args: [
     '-DIN_LIBVIRT',
-    '-Dabs_top_builddir="@0@"'.format(meson.build_root()),
+    '-Dabs_top_builddir="@0@"'.format(meson.project_build_root()),
     '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
   ] + coverage_flags + win32_flags,
   dependencies: [
@@ -1032,7 +1032,7 @@ run_pkg_config_files = [
 
 run_pkg_config_conf = configuration_data({
   'VERSION': meson.project_version(),
-  'abs_top_builddir': meson.build_root(),
+  'abs_top_builddir': meson.project_build_root(),
   'abs_top_srcdir': meson.source_root(),
 })
 

diff --git a/tests/meson.build b/tests/meson.build
index 2556b71444059e5c0edf8175c83d529bd6c761c0..3819eb8ba9fed8dc84c4620bce7281a21f8520ae 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,7 +1,7 @@
 tests_dep = declare_dependency(
   compile_args: [
     '-Dabs_builddir="@0@"'.format(meson.current_build_dir()),
-    '-Dabs_top_builddir="@0@"'.format(meson.build_root()),
+    '-Dabs_top_builddir="@0@"'.format(meson.project_build_root()),
     '-Dabs_srcdir="@0@"'.format(meson.current_source_dir()),
     '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
   ] + coverage_flags + cc_flags_relaxed_frame_limit,
@@ -36,7 +36,7 @@ tests_dep = declare_dependency(
 tests_env = [
   'abs_builddir=@0@'.format(meson.current_build_dir()),
   'abs_srcdir=@0@'.format(meson.current_source_dir()),
-  'abs_top_builddir=@0@'.format(meson.build_root()),
+  'abs_top_builddir=@0@'.format(meson.project_build_root()),
   'abs_top_srcdir=@0@'.format(meson.source_root()),
   'LC_ALL=C',
   'LIBVIRT_AUTOSTART=0',