External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2022-10-07 09:31:32 +02:00
parent 190486519a
commit 5ecdcf8541
13 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/meson.build
View File

@ -30,7 +30,7 @@ awk_prog = find_program('awk')
syntax_check_conf = configuration_data({ syntax_check_conf = configuration_data({
'top_srcdir': meson.source_root(), 'top_srcdir': meson.source_root(),
'top_builddir': meson.build_root(), 'top_builddir': meson.project_build_root(),
'flake8_path': flake8_path, 'flake8_path': flake8_path,
'runutf8': ' '.join(runutf8), 'runutf8': ' '.join(runutf8),
'PYTHON3': python3_prog.path(), 'PYTHON3': python3_prog.path(),

2
docs/go/meson.build
View File

@ -31,7 +31,7 @@ foreach data : html_xslt_gen
command: [ command: [
xsltproc_prog, xsltproc_prog,
'--stringparam', 'pagesrc', data.get('source', ''), '--stringparam', 'pagesrc', data.get('source', ''),
'--stringparam', 'builddir', meson.build_root(), '--stringparam', 'builddir', meson.project_build_root(),
'--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'timestamp', docs_timestamp,
'--stringparam', 'href_base', data.get('href_base', ''), '--stringparam', 'href_base', data.get('href_base', ''),
'--nonet', '--nonet',

4
docs/html/meson.build
View File

@ -39,7 +39,7 @@ index_api_gen = custom_target(
], ],
command: [ command: [
xsltproc_prog, '--nonet', '-o', docs_builddir, xsltproc_prog, '--nonet', '-o', docs_builddir,
'--stringparam', 'builddir', meson.build_root(), '--stringparam', 'builddir', meson.project_build_root(),
'--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'timestamp', docs_timestamp,
'@INPUT@', '@INPUT@',
], ],
@ -66,7 +66,7 @@ foreach name : [ 'admin', 'lxc', 'qemu' ]
], ],
command: [ command: [
xsltproc_prog, '--nonet', '-o', docs_builddir, xsltproc_prog, '--nonet', '-o', docs_builddir,
'--stringparam', 'builddir', meson.build_root(), '--stringparam', 'builddir', meson.project_build_root(),
'--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'timestamp', docs_timestamp,
'--stringparam', 'indexfile', 'index-@0@.html'.format(name), '--stringparam', 'indexfile', 'index-@0@.html'.format(name),
'@INPUT@', '@INPUT@',

2
docs/kbase/internals/meson.build
View File

@ -40,7 +40,7 @@ foreach data : html_xslt_gen
command: [ command: [
xsltproc_prog, xsltproc_prog,
'--stringparam', 'pagesrc', data.get('source', ''), '--stringparam', 'pagesrc', data.get('source', ''),
'--stringparam', 'builddir', meson.build_root(), '--stringparam', 'builddir', meson.project_build_root(),
'--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'timestamp', docs_timestamp,
'--stringparam', 'href_base', data.get('href_base', ''), '--stringparam', 'href_base', data.get('href_base', ''),
'--nonet', '--nonet',

2
docs/kbase/meson.build
View File

@ -50,7 +50,7 @@ foreach data : html_xslt_gen
command: [ command: [
xsltproc_prog, xsltproc_prog,
'--stringparam', 'pagesrc', data.get('source', ''), '--stringparam', 'pagesrc', data.get('source', ''),
'--stringparam', 'builddir', meson.build_root(), '--stringparam', 'builddir', meson.project_build_root(),
'--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'timestamp', docs_timestamp,
'--stringparam', 'href_base', data.get('href_base', ''), '--stringparam', 'href_base', data.get('href_base', ''),
'--nonet', '--nonet',

2
docs/manpages/meson.build
View File

@ -148,7 +148,7 @@ foreach data : html_xslt_gen
command: [ command: [
xsltproc_prog, xsltproc_prog,
'--stringparam', 'pagesrc', data.get('source', ''), '--stringparam', 'pagesrc', data.get('source', ''),
'--stringparam', 'builddir', meson.build_root(), '--stringparam', 'builddir', meson.project_build_root(),
'--stringparam', 'timestamp', docs_timestamp, '--stringparam', 'timestamp', docs_timestamp,
'--stringparam', 'href_base', data.get('href_base', ''), '--stringparam', 'href_base', data.get('href_base', ''),
'--nonet', '--nonet',

6
docs/meson.build
View File

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

8
meson.build
View File

@ -26,7 +26,7 @@ endif
conf = configuration_data() conf = configuration_data()
conf.set('_GNU_SOURCE', 1) 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('abs_top_srcdir', meson.source_root())
conf.set_quoted('PACKAGE', meson.project_name()) conf.set_quoted('PACKAGE', meson.project_name())
conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set_quoted('PACKAGE_NAME', meson.project_name())
@ -2171,7 +2171,7 @@ if git
foreach file : dist_files foreach file : dist_files
meson.add_dist_script( meson.add_dist_script(
meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(), meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(),
meson.build_root(), file meson.project_build_root(), file
) )
endforeach endforeach
endif endif
@ -2183,8 +2183,8 @@ configure_file(output: 'meson-config.h', configuration: conf)
# generate run helper # generate run helper
run_conf = configuration_data({ run_conf = configuration_data({
'abs_builddir': meson.build_root(), 'abs_builddir': meson.project_build_root(),
'abs_top_builddir': meson.build_root(), 'abs_top_builddir': meson.project_build_root(),
}) })
configure_file( configure_file(

2
po/meson.build
View File

@ -8,7 +8,7 @@ i18n.gettext(
'--keyword=N_', '--keyword=N_',
'--add-comments=TRANSLATORS:', '--add-comments=TRANSLATORS:',
'--directory=@0@'.format(meson.source_root()), '--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'), '--files-from=@0@'.format(meson.current_source_dir() / 'POTFILES'),
'--msgid-bugs-address=https://libvirt.org/bugs.html', '--msgid-bugs-address=https://libvirt.org/bugs.html',
'--package-version=@0@'.format(meson.project_version()), '--package-version=@0@'.format(meson.project_version()),

4
src/esx/meson.build
View File

@ -27,7 +27,7 @@ esx_gen_headers = custom_target(
command: [ command: [
meson_python_prog, python3_prog, esx_vi_generator_prog, meson_python_prog, python3_prog, esx_vi_generator_prog,
meson.source_root() / 'src', meson.source_root() / 'src',
meson.build_root() / 'src', meson.project_build_root() / 'src',
'header', 'header',
], ],
) )
@ -48,7 +48,7 @@ esx_gen_sources = custom_target(
command: [ command: [
meson_python_prog, python3_prog, esx_vi_generator_prog, meson_python_prog, python3_prog, esx_vi_generator_prog,
meson.source_root() / 'src', meson.source_root() / 'src',
meson.build_root() / 'src', meson.project_build_root() / 'src',
'source', 'source',
], ],
) )

2
src/hyperv/meson.build
View File

@ -19,7 +19,7 @@ hyperv_gen_sources = custom_target(
command: [ command: [
meson_python_prog, python3_prog, hyperv_wmi_generator_prog, meson_python_prog, python3_prog, hyperv_wmi_generator_prog,
meson.source_root() / 'src', meson.source_root() / 'src',
meson.build_root() / 'src', meson.project_build_root() / 'src',
], ],
) )

4
src/meson.build
View File

@ -3,7 +3,7 @@ src_inc_dir = include_directories('.')
src_dep = declare_dependency( src_dep = declare_dependency(
compile_args: [ compile_args: [
'-DIN_LIBVIRT', '-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()), '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
] + coverage_flags + win32_flags, ] + coverage_flags + win32_flags,
dependencies: [ dependencies: [
@ -1032,7 +1032,7 @@ run_pkg_config_files = [
run_pkg_config_conf = configuration_data({ run_pkg_config_conf = configuration_data({
'VERSION': meson.project_version(), 'VERSION': meson.project_version(),
'abs_top_builddir': meson.build_root(), 'abs_top_builddir': meson.project_build_root(),
'abs_top_srcdir': meson.source_root(), 'abs_top_srcdir': meson.source_root(),
}) })

4
tests/meson.build
View File

@ -1,7 +1,7 @@
tests_dep = declare_dependency( tests_dep = declare_dependency(
compile_args: [ compile_args: [
'-Dabs_builddir="@0@"'.format(meson.current_build_dir()), '-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_srcdir="@0@"'.format(meson.current_source_dir()),
'-Dabs_top_srcdir="@0@"'.format(meson.source_root()), '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
] + coverage_flags + cc_flags_relaxed_frame_limit, ] + coverage_flags + cc_flags_relaxed_frame_limit,
@ -36,7 +36,7 @@ tests_dep = declare_dependency(
tests_env = [ tests_env = [
'abs_builddir=@0@'.format(meson.current_build_dir()), 'abs_builddir=@0@'.format(meson.current_build_dir()),
'abs_srcdir=@0@'.format(meson.current_source_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()), 'abs_top_srcdir=@0@'.format(meson.source_root()),
'LC_ALL=C', 'LC_ALL=C',
'LIBVIRT_AUTOSTART=0', 'LIBVIRT_AUTOSTART=0',