| When using .path() for an argument to a python script meson will not |
| setup dependancies on the file. This means that changes to the generator |
| script will not trigger a rebiuld |
| |
| Signed-off-by: Daniel P. Berrangé <berrange redhat com> |
| --- |
| docs/manpages/meson.build | 4 ++-- |
| docs/meson.build | 8 ++++---- |
| src/access/meson.build | 2 +- |
| src/admin/meson.build | 4 ++-- |
| src/esx/meson.build | 4 ++-- |
| src/hyperv/meson.build | 2 +- |
| src/meson.build | 16 ++++++++-------- |
| src/qemu/meson.build | 2 +- |
| src/util/meson.build | 4 ++-- |
| 9 files changed, 23 insertions(+), 23 deletions(-) |
| |
| diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build |
| index ecc517e80e..7156c10cc6 100644 |
| --- a/docs/manpages/meson.build |
| +++ b/docs/manpages/meson.build |
| @@ -32,7 +32,7 @@ foreach name : keycode_list |
| input: keymap_src_file, |
| output: 'virkeycode- 0@.rst'.format(name), |
| command: [ |
| - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'code-docs', |
| + meson_python_prog, python3_prog, keymap_gen_prog, 'code-docs', |
| '--lang', 'rst', |
| '--title', 'virkeycode- 0@'.format(name), |
| '--subtitle', 'Key code values for @0@'.format(name), |
| @@ -53,7 +53,7 @@ foreach name : keyname_list |
| input: keymap_src_file, |
| output: 'virkeyname- 0@.rst'.format(name), |
| command: [ |
| - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'name-docs', |
| + meson_python_prog, python3_prog, 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 a915d6252a..28914f76f9 100644 |
| --- a/docs/meson.build |
| +++ b/docs/meson.build |
| @@ -140,7 +140,7 @@ aclperms_gen = custom_target( |
| input: access_perm_h, |
| output: 'aclperms.htmlinc', |
| command: [ |
| - meson_python_prog, python3_prog.path(), genaclperms_prog.path(), '@INPUT@', |
| + meson_python_prog, python3_prog, genaclperms_prog, '@INPUT@', |
| ], |
| capture: true, |
| ) |
| @@ -163,7 +163,7 @@ docs_api_generated = custom_target( |
| 'libvirt-admin-api.xml', |
| ], |
| command: [ |
| - meson_python_prog, python3_prog.path(), apibuild_prog.path(), |
| + meson_python_prog, python3_prog, apibuild_prog, |
| meson.current_source_dir(), |
| meson.current_build_dir(), |
| ], |
| @@ -233,8 +233,8 @@ hvsupport_html_in = custom_target( |
| output: 'hvsupport.html.in', |
| command: [ |
| meson_python_prog, |
| - python3_prog.path(), |
| - hvsupport_prog.path(), |
| + python3_prog, |
| + hvsupport_prog, |
| meson.source_root(), |
| meson.build_root(), |
| ], |
| diff --git a/src/access/meson.build b/src/access/meson.build |
| index 1cffdae21a..36aff6fd88 100644 |
| --- a/src/access/meson.build |
| +++ b/src/access/meson.build |
| @@ -82,7 +82,7 @@ if conf.has('WITH_POLKIT') |
| 'org.libvirt.api.policy', |
| input: access_perm_h, |
| output: 'org.libvirt.api.policy', |
| - command: [ meson_python_prog, python3_prog.path(), genpolkit_prog.path(), '@INPUT@' ], |
| + command: [ meson_python_prog, python3_prog, genpolkit_prog, '@INPUT@' ], |
| capture: true, |
| install: true, |
| install_dir: datadir / 'polkit-1' / 'actions', |
| diff --git a/src/admin/meson.build b/src/admin/meson.build |
| index e97974231f..f787c6665b 100644 |
| --- 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.path(), meson_gen_sym_prog.path(), |
| + meson_python_prog, python3_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.path(), meson_gen_def_prog.path(), |
| + meson_python_prog, python3_prog, meson_gen_def_prog, |
| '@INPUT@', '@OUTPUT@', |
| ], |
| ) |
| diff --git a/src/esx/meson.build b/src/esx/meson.build |
| index 2a7fcd54c9..5861e90afa 100644 |
| --- 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.path(), esx_vi_generator_prog.path(), |
| + meson_python_prog, python3_prog, esx_vi_generator_prog, |
| meson.source_root() / 'src', |
| meson.build_root() / 'src', |
| 'header', |
| @@ -46,7 +46,7 @@ esx_gen_sources = custom_target( |
| 'esx_vi_types.generated.typetostring', |
| ], |
| command: [ |
| - meson_python_prog, python3_prog.path(), esx_vi_generator_prog.path(), |
| + meson_python_prog, python3_prog, esx_vi_generator_prog, |
| meson.source_root() / 'src', |
| meson.build_root() / 'src', |
| 'source', |
| diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build |
| index 84fcedce38..1020e3d6b0 100644 |
| --- a/src/hyperv/meson.build |
| +++ b/src/hyperv/meson.build |
| @@ -16,7 +16,7 @@ hyperv_gen_sources = custom_target( |
| 'hyperv_wmi_classes.generated.typedef', |
| ], |
| command: [ |
| - meson_python_prog, python3_prog.path(), hyperv_wmi_generator_prog.path(), |
| + meson_python_prog, python3_prog, hyperv_wmi_generator_prog, |
| meson.source_root() / 'src', |
| meson.build_root() / 'src', |
| ], |
| diff --git a/src/meson.build b/src/meson.build |
| index 72dad0ab45..7c478219d6 100644 |
| --- a/src/meson.build |
| +++ b/src/meson.build |
| @@ -75,7 +75,7 @@ if conf.has('WITH_DTRACE_PROBES') |
| input: infile, |
| output: out_stp, |
| command: [ |
| - meson_python_prog, python3_prog.path(), dtrace2systemtap_prog.path(), |
| + meson_python_prog, python3_prog, dtrace2systemtap_prog, |
| bindir, sbindir, libdir, '@INPUT@' |
| ], |
| capture: true, |
| @@ -356,7 +356,7 @@ libvirt_syms = custom_target( |
| input: [ public_sym_file ] + used_sym_files + generated_sym_files, |
| output: 'libvirt.syms', |
| command: [ |
| - meson_python_prog, python3_prog.path(), meson_gen_sym_prog.path(), |
| + meson_python_prog, python3_prog, meson_gen_sym_prog, |
| '@OUTPUT@', 'LIBVIRT_PRIVATE_' + meson.project_version(), '@INPUT@', |
| ], |
| ) |
| @@ -367,7 +367,7 @@ if host_machine.system() == 'windows' |
| input: libvirt_syms, |
| output: 'libvirt.def', |
| command: [ |
| - meson_python_prog, python3_prog.path(), meson_gen_def_prog.path(), |
| + meson_python_prog, python3_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.path(), meson_gen_def_prog.path(), |
| + meson_python_prog, python3_prog, meson_gen_def_prog, |
| '@INPUT@', '@OUTPUT@', |
| ], |
| ) |
| @@ -471,7 +471,7 @@ if host_machine.system() == 'windows' |
| input: libvirt_lxc_syms, |
| output: 'libvirt_lxc.def', |
| command: [ |
| - meson_python_prog, python3_prog.path(), meson_gen_def_prog.path(), |
| + meson_python_prog, python3_prog, meson_gen_def_prog, |
| '@INPUT@', '@OUTPUT@', |
| ], |
| ) |
| @@ -686,7 +686,7 @@ foreach data : virt_test_aug_files |
| input: [ data['conf'], data['aug'] ], |
| output: data['name'], |
| command: [ |
| - meson_python_prog, python3_prog.path(), augeas_gentest_prog.path(), |
| + meson_python_prog, python3_prog, augeas_gentest_prog, |
| '@INPUT@', |
| ], |
| capture: true, |
| @@ -762,7 +762,7 @@ foreach data : virt_daemon_confs |
| input: [ conf_out, test_aug_tmp ], |
| output: test_aug_out, |
| command: [ |
| - meson_python_prog, python3_prog.path(), augeas_gentest_prog.path(), |
| + meson_python_prog, python3_prog, augeas_gentest_prog, |
| '@INPUT@', |
| ], |
| capture: true, |
| @@ -884,7 +884,7 @@ if conf.has('WITH_DTRACE_PROBES') |
| input: rpc_probe_files, |
| output: 'libvirt_functions.stp', |
| command: [ |
| - meson_python_prog, python3_prog.path(), gensystemtap_prog.path(), |
| + meson_python_prog, python3_prog, gensystemtap_prog, |
| '@INPUT@', |
| ], |
| capture: true, |
| diff --git a/src/qemu/meson.build b/src/qemu/meson.build |
| index 4e599d1e69..90640b03c6 100644 |
| --- a/src/qemu/meson.build |
| +++ b/src/qemu/meson.build |
| @@ -71,7 +71,7 @@ if conf.has('WITH_DTRACE_PROBES') |
| input: infile, |
| output: out_stp, |
| command: [ |
| - meson_python_prog, python3_prog.path(), dtrace2systemtap_prog.path(), |
| + meson_python_prog, python3_prog, dtrace2systemtap_prog, |
| bindir, sbindir, libdir, '@INPUT@', |
| ], |
| capture: true, |
| diff --git a/src/util/meson.build b/src/util/meson.build |
| index 3b711b1dc2..395e70fd38 100644 |
| --- a/src/util/meson.build |
| +++ b/src/util/meson.build |
| @@ -144,7 +144,7 @@ foreach name : keycode_list |
| input: keymap_src_file, |
| output: 'virkeycodetable_ 0@.h'.format(name), |
| command: [ |
| - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'code-table', |
| + meson_python_prog, python3_prog, keymap_gen_prog, 'code-table', |
| '--lang', 'stdc', |
| '--varname', 'virKeyCodeTable_ 0@'.format(name), |
| '@INPUT@', name, |
| @@ -159,7 +159,7 @@ foreach name : keyname_list |
| input: keymap_src_file, |
| output: 'virkeynametable_ 0@.h'.format(name), |
| command: [ |
| - meson_python_prog, python3_prog.path(), keymap_gen_prog.path(), 'name-table', |
| + meson_python_prog, python3_prog, keymap_gen_prog, 'name-table', |
| '--lang', 'stdc', |
| '--varname', 'virKeyNameTable_ 0@'.format(name), |
| '@INPUT@', name, |
| -- |
| 2.28.0 |