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>

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index 84b2e247e920711f65518bc3c302a6fb00c459bc..afcadaefbd40c4d97a0e14c17eef68a05cedc108 100644 (file)
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -49,7 +49,7 @@ foreach name : keycode_list
     input: keymap_src_file,
     output: 'virkeycode-@0@.rst'.format(name),
     command: [
-      meson_python_prog, python3_prog, keymap_gen_prog, 'code-docs',
+      keymap_gen_prog, 'code-docs',
       '--lang', 'rst',
       '--title', 'virkeycode-@0@'.format(name),
       '--subtitle', 'Key code values for @0@'.format(name),
@@ -70,7 +70,7 @@ foreach name : keyname_list
     input: keymap_src_file,
     output: 'virkeyname-@0@.rst'.format(name),
     command: [
-      meson_python_prog, python3_prog, keymap_gen_prog, 'name-docs',
+      keymap_gen_prog, 'name-docs',
       '--lang', 'rst',
       '--title', 'virkeyname-@0@'.format(name),
       '--subtitle', 'Key name values for @0@'.format(name),

diff --git a/docs/meson.build b/docs/meson.build
index 8f84d08912c248df60b540a8526dbd9990c6c452..769efe7b6a276ec862ef85a91cb8f64722ae42cf 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -123,7 +123,7 @@ aclperms_gen = custom_target(
   input: access_perm_h,
   output: 'aclperms.htmlinc',
   command: [
-    meson_python_prog, python3_prog, genaclperms_prog, '@INPUT@',
+    genaclperms_prog, '@INPUT@',
   ],
   capture: true,
 )
@@ -145,7 +145,7 @@ docs_api_generated = custom_target(
     'libvirt-admin-api.xml',
   ],
   command: [
-    meson_python_prog, python3_prog, apibuild_prog,
+    apibuild_prog,
     meson.current_source_dir(),
     meson.current_build_dir(),
   ],
@@ -264,8 +264,6 @@ hvsupport_html_in = custom_target(
   'hvsupport.html.in',
   output: 'hvsupport.html.in',
   command: [
-    meson_python_prog,
-    python3_prog,
     hvsupport_prog,
     meson.project_source_root(),
     meson.project_build_root(),

diff --git a/src/admin/meson.build b/src/admin/meson.build
index 692cc128a311128091fb1e759a5c8b3433b69e6f..e04d610f924c2853efdf68e8f1f735f7f961a4c4 100644 (file)
--- a/src/admin/meson.build
+++ b/src/admin/meson.build
@@ -68,7 +68,7 @@ libvirt_admin_syms = custom_target(
   ],
   output: 'libvirt_admin.syms',
   command: [
-    meson_python_prog, python3_prog, meson_gen_sym_prog,
+    meson_gen_sym_prog,
     '@OUTPUT@', 'LIBVIRT_ADMIN_PRIVATE_' + meson.project_version(), '@INPUT@',
   ],
 )
@@ -79,7 +79,7 @@ if host_machine.system() == 'windows'
     input: libvirt_admin_syms,
     output: 'libvirt_admin.def',
     command: [
-      meson_python_prog, python3_prog, meson_gen_def_prog,
+      meson_gen_def_prog,
       '@INPUT@', '@OUTPUT@',
     ],
   )

diff --git a/src/esx/meson.build b/src/esx/meson.build
index d1f42fdcc44ea9aae419fa2ac50fddf58f20350a..4bd0dadd51b0d63f277d893f095d3a61a568dc73 100644 (file)
--- a/src/esx/meson.build
+++ b/src/esx/meson.build
@@ -25,7 +25,7 @@ esx_gen_headers = custom_target(
     'esx_vi_types.generated.typeenum',
   ],
   command: [
-    meson_python_prog, python3_prog, esx_vi_generator_prog,
+    esx_vi_generator_prog,
     meson.project_source_root() / 'src',
     meson.project_build_root() / 'src',
     'header',
@@ -46,7 +46,7 @@ esx_gen_sources = custom_target(
     'esx_vi_types.generated.typetostring',
   ],
   command: [
-    meson_python_prog, python3_prog, esx_vi_generator_prog,
+    esx_vi_generator_prog,
     meson.project_source_root() / 'src',
     meson.project_build_root() / 'src',
     'source',

diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build
index 3509ce12f7bc51c4643b2bf144b25b1a19cdde03..446b6ddada5981d88eca840bae8c58a239f292b9 100644 (file)
--- a/src/hyperv/meson.build
+++ b/src/hyperv/meson.build
@@ -17,7 +17,7 @@ hyperv_gen_sources = custom_target(
     'hyperv_wmi_classes.generated.typedef',
   ],
   command: [
-    meson_python_prog, python3_prog, hyperv_wmi_generator_prog,
+    hyperv_wmi_generator_prog,
     meson.project_source_root() / 'src',
     meson.project_build_root() / 'src',
   ],

diff --git a/src/meson.build b/src/meson.build
index 35951d8990caf893a76c29a2abc0c208c3d18c5c..ad7796f03d1c45a6de20ca8dcde61d86cb9514ba 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -350,7 +350,7 @@ libvirt_syms = custom_target(
   input: [ public_sym_file ] + used_sym_files + generated_sym_files,
   output: 'libvirt.syms',
   command: [
-    meson_python_prog, python3_prog, meson_gen_sym_prog,
+    meson_gen_sym_prog,
     '@OUTPUT@', 'LIBVIRT_PRIVATE_' + meson.project_version(), '@INPUT@',
   ],
 )
@@ -361,7 +361,7 @@ if host_machine.system() == 'windows'
     input: libvirt_syms,
     output: 'libvirt.def',
     command: [
-      meson_python_prog, python3_prog, meson_gen_def_prog,
+      meson_gen_def_prog,
       '@INPUT@', '@OUTPUT@',
     ],
   )
@@ -417,7 +417,7 @@ if host_machine.system() == 'windows'
     input: libvirt_qemu_syms,
     output: 'libvirt_qemu.def',
     command: [
-      meson_python_prog, python3_prog, meson_gen_def_prog,
+      meson_gen_def_prog,
       '@INPUT@', '@OUTPUT@',
     ],
   )
@@ -476,7 +476,7 @@ if host_machine.system() == 'windows'
     input: libvirt_lxc_syms,
     output: 'libvirt_lxc.def',
     command: [
-      meson_python_prog, python3_prog, meson_gen_def_prog,
+      meson_gen_def_prog,
       '@INPUT@', '@OUTPUT@',
     ],
   )

diff --git a/src/util/meson.build b/src/util/meson.build
index f055079d0b449ebe7d78b2c14cb3de52a7dc2f0b..c6b1294f24750b5483bc7607b1460b205e24dbc4 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -147,7 +147,7 @@ foreach name : keycode_list
     input: keymap_src_file,
     output: 'virkeycodetable_@0@.h'.format(name),
     command: [
-      meson_python_prog, python3_prog, keymap_gen_prog, 'code-table',
+      keymap_gen_prog, 'code-table',
       '--lang', 'stdc',
       '--varname', 'virKeyCodeTable_@0@'.format(name),
       '@INPUT@', name,
@@ -162,7 +162,7 @@ foreach name : keyname_list
     input: keymap_src_file,
     output: 'virkeynametable_@0@.h'.format(name),
     command: [
-      meson_python_prog, python3_prog, keymap_gen_prog, 'name-table',
+      keymap_gen_prog, 'name-table',
       '--lang', 'stdc',
       '--varname', 'virKeyNameTable_@0@'.format(name),
       '@INPUT@', name,