mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-12 13:17:58 +03:00
meson: drop explicit python interpreter
meson wraps python scripts already on win32, so we end up with these failing commands: [1/359] "C:/msys64/ucrt64/bin/meson" "--internal" "exe" "--capture" "src/util/virkeycodetable_atset1.h" "--" "sh" "C:/msys64/home/marca/src/libvirt/scripts/meson-python.sh" "C:/msys64/ucrt64/bin/python3.EXE" "python" "C:/msys64/home/marca/src/libvirt/src/keycodemapdb/tools/keymap-gen" "code-table" "--lang" "stdc" "--varname" "virKeyCodeTable_atset1" "C:/msys64/home/marca/src/libvirt/src/keycodemapdb/data/keymaps.csv" "atset1" FAILED: src/util/virkeycodetable_atset1.h "C:/msys64/ucrt64/bin/meson" "--internal" "exe" "--capture" "src/util/virkeycodetable_atset1.h" "--" "sh" "C:/msys64/home/marca/src/libvirt/scripts/meson-python.sh" "C:/msys64/ucrt64/bin/python3.EXE" "python" "C:/msys64/home/marca/src/libvirt/src/keycodemapdb/tools/keymap-gen" "code-table" "--lang" "stdc" "--varname" "virKeyCodeTable_atset1" "C:/msys64/home/marca/src/libvirt/src/keycodemapdb/data/keymaps.csv" "atset1" If LC_ALL, LANG and LC_CTYPE need to be set, it would probably be better to use a meson environment() instead. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
785dfe58fa
commit
e06beacec2
docs
src
@ -49,7 +49,7 @@ foreach name : keycode_list
|
|||||||
input: keymap_src_file,
|
input: keymap_src_file,
|
||||||
output: 'virkeycode-@0@.rst'.format(name),
|
output: 'virkeycode-@0@.rst'.format(name),
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, keymap_gen_prog, 'code-docs',
|
keymap_gen_prog, 'code-docs',
|
||||||
'--lang', 'rst',
|
'--lang', 'rst',
|
||||||
'--title', 'virkeycode-@0@'.format(name),
|
'--title', 'virkeycode-@0@'.format(name),
|
||||||
'--subtitle', 'Key code values for @0@'.format(name),
|
'--subtitle', 'Key code values for @0@'.format(name),
|
||||||
@ -70,7 +70,7 @@ foreach name : keyname_list
|
|||||||
input: keymap_src_file,
|
input: keymap_src_file,
|
||||||
output: 'virkeyname-@0@.rst'.format(name),
|
output: 'virkeyname-@0@.rst'.format(name),
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, keymap_gen_prog, 'name-docs',
|
keymap_gen_prog, 'name-docs',
|
||||||
'--lang', 'rst',
|
'--lang', 'rst',
|
||||||
'--title', 'virkeyname-@0@'.format(name),
|
'--title', 'virkeyname-@0@'.format(name),
|
||||||
'--subtitle', 'Key name values for @0@'.format(name),
|
'--subtitle', 'Key name values for @0@'.format(name),
|
||||||
|
@ -123,7 +123,7 @@ aclperms_gen = custom_target(
|
|||||||
input: access_perm_h,
|
input: access_perm_h,
|
||||||
output: 'aclperms.htmlinc',
|
output: 'aclperms.htmlinc',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, genaclperms_prog, '@INPUT@',
|
genaclperms_prog, '@INPUT@',
|
||||||
],
|
],
|
||||||
capture: true,
|
capture: true,
|
||||||
)
|
)
|
||||||
@ -145,7 +145,7 @@ docs_api_generated = custom_target(
|
|||||||
'libvirt-admin-api.xml',
|
'libvirt-admin-api.xml',
|
||||||
],
|
],
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, apibuild_prog,
|
apibuild_prog,
|
||||||
meson.current_source_dir(),
|
meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
],
|
],
|
||||||
@ -264,8 +264,6 @@ hvsupport_html_in = custom_target(
|
|||||||
'hvsupport.html.in',
|
'hvsupport.html.in',
|
||||||
output: 'hvsupport.html.in',
|
output: 'hvsupport.html.in',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog,
|
|
||||||
python3_prog,
|
|
||||||
hvsupport_prog,
|
hvsupport_prog,
|
||||||
meson.project_source_root(),
|
meson.project_source_root(),
|
||||||
meson.project_build_root(),
|
meson.project_build_root(),
|
||||||
|
@ -68,7 +68,7 @@ libvirt_admin_syms = custom_target(
|
|||||||
],
|
],
|
||||||
output: 'libvirt_admin.syms',
|
output: 'libvirt_admin.syms',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, meson_gen_sym_prog,
|
meson_gen_sym_prog,
|
||||||
'@OUTPUT@', 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_version(), '@INPUT@',
|
'@OUTPUT@', 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_version(), '@INPUT@',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -79,7 +79,7 @@ if host_machine.system() == 'windows'
|
|||||||
input: libvirt_admin_syms,
|
input: libvirt_admin_syms,
|
||||||
output: 'libvirt_admin.def',
|
output: 'libvirt_admin.def',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, meson_gen_def_prog,
|
meson_gen_def_prog,
|
||||||
'@INPUT@', '@OUTPUT@',
|
'@INPUT@', '@OUTPUT@',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -25,7 +25,7 @@ esx_gen_headers = custom_target(
|
|||||||
'esx_vi_types.generated.typeenum',
|
'esx_vi_types.generated.typeenum',
|
||||||
],
|
],
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, esx_vi_generator_prog,
|
esx_vi_generator_prog,
|
||||||
meson.project_source_root() / 'src',
|
meson.project_source_root() / 'src',
|
||||||
meson.project_build_root() / 'src',
|
meson.project_build_root() / 'src',
|
||||||
'header',
|
'header',
|
||||||
@ -46,7 +46,7 @@ esx_gen_sources = custom_target(
|
|||||||
'esx_vi_types.generated.typetostring',
|
'esx_vi_types.generated.typetostring',
|
||||||
],
|
],
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, esx_vi_generator_prog,
|
esx_vi_generator_prog,
|
||||||
meson.project_source_root() / 'src',
|
meson.project_source_root() / 'src',
|
||||||
meson.project_build_root() / 'src',
|
meson.project_build_root() / 'src',
|
||||||
'source',
|
'source',
|
||||||
|
@ -17,7 +17,7 @@ hyperv_gen_sources = custom_target(
|
|||||||
'hyperv_wmi_classes.generated.typedef',
|
'hyperv_wmi_classes.generated.typedef',
|
||||||
],
|
],
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, hyperv_wmi_generator_prog,
|
hyperv_wmi_generator_prog,
|
||||||
meson.project_source_root() / 'src',
|
meson.project_source_root() / 'src',
|
||||||
meson.project_build_root() / 'src',
|
meson.project_build_root() / 'src',
|
||||||
],
|
],
|
||||||
|
@ -350,7 +350,7 @@ libvirt_syms = custom_target(
|
|||||||
input: [ public_sym_file ] + used_sym_files + generated_sym_files,
|
input: [ public_sym_file ] + used_sym_files + generated_sym_files,
|
||||||
output: 'libvirt.syms',
|
output: 'libvirt.syms',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, meson_gen_sym_prog,
|
meson_gen_sym_prog,
|
||||||
'@OUTPUT@', 'LIBVIRT_PRIVATE_' + meson.project_version(), '@INPUT@',
|
'@OUTPUT@', 'LIBVIRT_PRIVATE_' + meson.project_version(), '@INPUT@',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -361,7 +361,7 @@ if host_machine.system() == 'windows'
|
|||||||
input: libvirt_syms,
|
input: libvirt_syms,
|
||||||
output: 'libvirt.def',
|
output: 'libvirt.def',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, meson_gen_def_prog,
|
meson_gen_def_prog,
|
||||||
'@INPUT@', '@OUTPUT@',
|
'@INPUT@', '@OUTPUT@',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -417,7 +417,7 @@ if host_machine.system() == 'windows'
|
|||||||
input: libvirt_qemu_syms,
|
input: libvirt_qemu_syms,
|
||||||
output: 'libvirt_qemu.def',
|
output: 'libvirt_qemu.def',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, meson_gen_def_prog,
|
meson_gen_def_prog,
|
||||||
'@INPUT@', '@OUTPUT@',
|
'@INPUT@', '@OUTPUT@',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -476,7 +476,7 @@ if host_machine.system() == 'windows'
|
|||||||
input: libvirt_lxc_syms,
|
input: libvirt_lxc_syms,
|
||||||
output: 'libvirt_lxc.def',
|
output: 'libvirt_lxc.def',
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, meson_gen_def_prog,
|
meson_gen_def_prog,
|
||||||
'@INPUT@', '@OUTPUT@',
|
'@INPUT@', '@OUTPUT@',
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -147,7 +147,7 @@ foreach name : keycode_list
|
|||||||
input: keymap_src_file,
|
input: keymap_src_file,
|
||||||
output: 'virkeycodetable_@0@.h'.format(name),
|
output: 'virkeycodetable_@0@.h'.format(name),
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, keymap_gen_prog, 'code-table',
|
keymap_gen_prog, 'code-table',
|
||||||
'--lang', 'stdc',
|
'--lang', 'stdc',
|
||||||
'--varname', 'virKeyCodeTable_@0@'.format(name),
|
'--varname', 'virKeyCodeTable_@0@'.format(name),
|
||||||
'@INPUT@', name,
|
'@INPUT@', name,
|
||||||
@ -162,7 +162,7 @@ foreach name : keyname_list
|
|||||||
input: keymap_src_file,
|
input: keymap_src_file,
|
||||||
output: 'virkeynametable_@0@.h'.format(name),
|
output: 'virkeynametable_@0@.h'.format(name),
|
||||||
command: [
|
command: [
|
||||||
meson_python_prog, python3_prog, keymap_gen_prog, 'name-table',
|
keymap_gen_prog, 'name-table',
|
||||||
'--lang', 'stdc',
|
'--lang', 'stdc',
|
||||||
'--varname', 'virKeyNameTable_@0@'.format(name),
|
'--varname', 'virKeyNameTable_@0@'.format(name),
|
||||||
'@INPUT@', name,
|
'@INPUT@', name,
|
||||||
|
Loading…
Reference in New Issue
Block a user