treewide: meson.build: use project_{build,source}_root()

Use `meson.project_{build,source}_root()` instead of
`meson.{build,source}_root()` because those functions
do not work as expected when used inside a subproject,
and they have been deprecated in meson 0.56.0.
This commit is contained in:
Barnabás Pőcze 2021-12-28 16:35:20 +01:00
parent b666edde78
commit 8ed46a283f
8 changed files with 36 additions and 36 deletions

View file

@ -1,8 +1,8 @@
doxyfile_conf = configuration_data()
doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())
doxyfile_conf.set('top_srcdir', meson.source_root())
doxyfile_conf.set('top_builddir', meson.build_root())
doxyfile_conf.set('top_srcdir', meson.project_source_root())
doxyfile_conf.set('top_builddir', meson.project_build_root())
dot_found = find_program('dot', required: false).found()
summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
@ -49,35 +49,35 @@ extra_docs = [
inputs = []
foreach extra : extra_docs
inputs += meson.source_root() / 'doc' / extra
inputs += meson.project_source_root() / 'doc' / extra
endforeach
foreach h : pipewire_headers
inputs += meson.source_root() / 'src' / 'pipewire' / h
inputs += meson.project_source_root() / 'src' / 'pipewire' / h
endforeach
foreach h : pipewire_ext_headers
inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
endforeach
foreach h : pipewire_ext_sm_headers
inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
endforeach
foreach h : pipewire_sources
inputs += meson.source_root() / 'src' / 'pipewire' / h
inputs += meson.project_source_root() / 'src' / 'pipewire' / h
endforeach
foreach h : module_sources
inputs += meson.source_root() / 'src' / 'modules' / h
inputs += meson.project_source_root() / 'src' / 'modules' / h
endforeach
inputs += meson.source_root() / 'test' / 'pwtest.h'
input_dirs = [ meson.source_root() / 'spa' / 'include' / 'spa' ]
inputs += meson.project_source_root() / 'test' / 'pwtest.h'
input_dirs = [ meson.project_source_root() / 'spa' / 'include' / 'spa' ]
path_prefixes = [
meson.source_root() / 'src',
meson.source_root() / 'spa' / 'include',
meson.source_root(),
meson.project_source_root() / 'src',
meson.project_source_root() / 'spa' / 'include',
meson.project_source_root(),
]
cssfiles = [
meson.source_root() / 'doc' / 'doxygen-awesome.css',
meson.source_root() / 'doc' / 'custom.css'
meson.project_source_root() / 'doc' / 'doxygen-awesome.css',
meson.project_source_root() / 'doc' / 'custom.css'
]
# Example files (in order from simple to esoteric)
@ -118,8 +118,8 @@ input_dirs += [ 'doc/examples.dox' ]
doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))
doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
doxyfile_conf.set('c_input_filter', meson.source_root() / 'doc' / 'input-filter.sh')
doxyfile_conf.set('h_input_filter', meson.source_root() / 'doc' / 'input-filter-h.sh')
doxyfile_conf.set('c_input_filter', meson.project_source_root() / 'doc' / 'input-filter.sh')
doxyfile_conf.set('h_input_filter', meson.project_source_root() / 'doc' / 'input-filter-h.sh')
doxyfile = configure_file(input: 'Doxyfile.in',
output: 'Doxyfile',

View file

@ -304,9 +304,9 @@ includes_inc = include_directories('include')
pipewire_inc = include_directories('src')
makedata = configuration_data()
makedata.set('BUILD_ROOT', meson.build_root())
makedata.set('SOURCE_ROOT', meson.source_root())
makedata.set('VERSION', pipewire_version)
makedata.set('BUILD_ROOT', meson.project_build_root())
makedata.set('SOURCE_ROOT', meson.project_source_root())
makedata.set('VERSION', pipewire_version)
if version_arr.length() == 4
makedata.set('TAG', 'HEAD')
else
@ -498,7 +498,7 @@ endif
setenv = find_program('pw-uninstalled.sh')
run_target('pw-uninstalled',
command : [setenv,
'-b@0@'.format(meson.build_root()),
'-b@0@'.format(meson.project_build_root()),
'-v@0@'.format(pipewire_version)]
)

View file

@ -140,7 +140,7 @@ foreach a : test_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
])
if installed_tests_enabled
@ -170,7 +170,7 @@ foreach a : benchmark_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
])
if installed_tests_enabled

View file

@ -5,7 +5,7 @@ find = find_program('find', required: false)
summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs')
if find.found()
spa_headers = run_command(find,
meson.source_root() / 'spa' / 'include',
meson.project_source_root() / 'spa' / 'include',
'-name', '*.h',
'-not', '-name', 'type-info.h',
'-type', 'f',
@ -40,7 +40,7 @@ foreach a : benchmark_apps
install_dir : installed_tests_execdir,
),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
]
)

View file

@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
conf_config_uninstalled = conf_config
conf_config_uninstalled.set('pipewire_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire')
meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
conf_config_uninstalled.set('pulse_comment', '')
build_ms = 'media-session' in get_option('session-managers')
@ -105,7 +105,7 @@ custom_target('pipewire-uninstalled',
install: false,
input: pipewire_exec,
output: 'pipewire-uninstalled',
command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
)
#desktop_file = i18n.merge_file(

View file

@ -379,9 +379,9 @@ test('pw-test-protocol-native',
install_dir : installed_tests_execdir,
),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
]
)

View file

@ -13,9 +13,9 @@ foreach a : test_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
])
if installed_tests_enabled

View file

@ -14,8 +14,8 @@ pwtest_deps = [
]
pwtest_c_args = [
'-DBUILD_ROOT="@0@"'.format(meson.build_root()),
'-DSOURCE_ROOT="@0@"'.format(meson.source_root()),
'-DBUILD_ROOT="@0@"'.format(meson.project_build_root()),
'-DSOURCE_ROOT="@0@"'.format(meson.project_source_root()),
]
pwtest_inc = [