meson: replace uses of ExternalProgram.path with .full_path

The former is deprecated

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20409>
This commit is contained in:
Dylan Baker
2022-12-21 09:31:30 -08:00
committed by Marge Bot
parent 92235e0c48
commit 3c5e969144
5 changed files with 7 additions and 7 deletions

View File

@@ -2326,12 +2326,12 @@ if host_machine.system() == 'windows'
prog_dumpbin = find_program('dumpbin', required : false)
with_symbols_check = prog_dumpbin.found() and with_tests
if with_symbols_check
symbols_check_args = ['--dumpbin', prog_dumpbin.path()]
symbols_check_args = ['--dumpbin', prog_dumpbin.full_path()]
endif
else
prog_nm = find_program('nm')
with_symbols_check = with_tests
symbols_check_args = ['--nm', prog_nm.path()]
symbols_check_args = ['--nm', prog_nm.full_path()]
endif
# This quirk needs to be applied to sources with functions defined in assembly

View File

@@ -43,7 +43,7 @@ spirv_files = files(
gen_spirv = generator(prog_python,
output : '@BASENAME@-spirv.h',
arguments : [join_paths(meson.current_source_dir(), 'glsl_scraper.py'),
'@INPUT@', '--with-glslang', prog_glslang.path(), '-o', '@OUTPUT@'])
'@INPUT@', '--with-glslang', prog_glslang.full_path(), '-o', '@OUTPUT@'])
gen_spirv_files = gen_spirv.process(spirv_files)
test(
@@ -53,7 +53,7 @@ test(
[aco_tests_files, gen_spirv_files],
cpp_args : ['-DACO_TEST_SOURCE_DIR="@0@"'.format(meson.current_source_dir()),
'-DACO_TEST_BUILD_ROOT="@0@"'.format(meson.build_root()),
'-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.path())] +
'-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.full_path())] +
cpp_args_aco,
include_directories : [
inc_include, inc_src, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common, inc_amd_common_llvm,

View File

@@ -140,7 +140,7 @@ if meson.version().version_compare('>= 0.58')
endif
meson.add_install_script(
install_megadrivers_py.path(),
install_megadrivers_py.full_path(),
libgallium_dri.full_path(),
dri_drivers_path,
gallium_dri_drivers,

View File

@@ -107,7 +107,7 @@ else
endforeach
meson.add_install_script(
install_megadrivers_py.path(),
install_megadrivers_py.full_path(),
libva_gallium.full_path(),
va_drivers_path,
va_drivers,

View File

@@ -77,7 +77,7 @@ foreach d : [[with_gallium_r300, 'r300'],
endforeach
meson.add_install_script(
install_megadrivers_py.path(),
install_megadrivers_py.full_path(),
libvdpau_gallium.full_path(),
vdpau_drivers_path,
vdpau_drivers,