SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: replace Perl usage with Python

Browse Source 
Let's try to remove Perl usage during build time.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230110132700.833690-5-marcandre.lureau@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230124180127.1881110-8-alex.bennee@linaro.org>
This commit is contained in:
Marc-André Lureau 2023-01-24 18:00:59 +00:00 committed by Alex Bennée
parent 7195f30248
commit ec91e92378
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/qapi-schema/meson.build
View File

@ -259,22 +259,23 @@ if build_docs
# Fix possible inconsistency in line endings in generated output and # Fix possible inconsistency in line endings in generated output and
# in the golden reference (which could otherwise cause test failures # in the golden reference (which could otherwise cause test failures
# on Windows hosts). Unfortunately diff --strip-trailing-cr # on Windows hosts). Unfortunately diff --strip-trailing-cr
# is GNU-diff only. The odd-looking perl is because we must avoid # is GNU-diff only. The odd-looking python is because we must avoid
# using an explicit '\' character in the command arguments to # using an explicit '\' character in the command arguments to
# a custom_target(), as Meson will unhelpfully replace it with a '/' # a custom_target(), as Meson will unhelpfully replace it with a '/'
# (https://github.com/mesonbuild/meson/issues/1564) # (https://github.com/mesonbuild/meson/issues/1564)
remove_cr = [python, '-c', 'import sys;[sys.stdout.write(line.replace(chr(13), "")) for line in sys.stdin]']
qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized', qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized',
output: ['doc-good.txt.nocr'], output: ['doc-good.txt.nocr'],
input: qapi_doc_out[0], input: qapi_doc_out[0],
build_by_default: true, build_by_default: true,
command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], command: [remove_cr, '@INPUT@'],
capture: true) capture: true)
qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized', qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized',
output: ['doc-good.ref.nocr'], output: ['doc-good.ref.nocr'],
input: files('doc-good.txt'), input: files('doc-good.txt'),
build_by_default: true, build_by_default: true,
command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], command: [remove_cr, '@INPUT@'],
capture: true) capture: true)
test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]], test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]],