mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-17 23:27:15 +00:00
ac7f3667f2
In our meson scripts, we use configure_file(copy:true) to copy
files from srcdir into builddir. However, as of meson-0.64.0,
this is deprecated [1] in favor of using:
fs = import('fs')
fs.copyfile(in, out)
Except, the submodule's new method wasn't introduced until
0.64.0. And since we can't bump the minimal meson version we
require, we have to work with both: new and old versions.
Now, the fun part: fs.copyfile() is not a drop in replacement as
it returns different type (a custom_target object). This is
incompatible with places where we store the configure_file()
retval in a variable to process it further.
While we could just replace 'copy:true' with a dummy
'configuration:...' (say 'configuration: configmake_conf') we
can't do that for binary files (like src/fonts/ or src/images/).
Therefore, places where we are not interested in the retval can
be switched to fs.copyfile() and places where we are interested
in the retval will just use a dummy 'configuration:'.
Except, src/network/meson.build. In here we not just copy the
file but also specify alternative install dir and that's not
something that fs.copyfile() can handle. Yet, using 'copy: true'
is viewed wrong [2].
1: https://mesonbuild.com/Release-notes-for-0-64-0.html#fscopyfile-to-replace-configure_filecopy-true
2: https://github.com/mesonbuild/meson/pull/10042
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
|
||
|---|---|---|
| .. | ||
| domain_lock.c | ||
| domain_lock.h | ||
| libvirt_lockd.aug | ||
| libvirt_sanlock.aug | ||
| lock_daemon_config.c | ||
| lock_daemon_config.h | ||
| lock_daemon_dispatch.c | ||
| lock_daemon_dispatch.h | ||
| lock_daemon.c | ||
| lock_daemon.h | ||
| lock_driver_lockd.c | ||
| lock_driver_lockd.h | ||
| lock_driver_nop.c | ||
| lock_driver_nop.h | ||
| lock_driver_sanlock.c | ||
| lock_driver.h | ||
| lock_manager.c | ||
| lock_manager.h | ||
| lock_protocol.x | ||
| lockd.conf | ||
| meson.build | ||
| sanlock_helper.c | ||
| sanlock.conf | ||
| test_libvirt_lockd.aug.in | ||
| test_libvirt_sanlock.aug.in | ||
| test_virtlockd.aug.in | ||
| virtlockd-admin.socket.in | ||
| virtlockd.aug | ||
| virtlockd.conf | ||
| virtlockd.init.in | ||
| virtlockd.service.in | ||
| virtlockd.socket.in | ||