meson: tools: generate virt-xml-validate script

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 09738014206f77e005504c5138abb337f92b511e..64a8dbc8450f6a3fa7464c0fe4fa68a47a44e7a5 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,7 +24,7 @@ STANDALONE_CPPFLAGS = -I$(top_srcdir)
 confdir = $(sysconfdir)/libvirt
 conf_DATA =
 
-bin_SCRIPTS = virt-xml-validate virt-pki-validate
+bin_SCRIPTS = virt-pki-validate
 libexec_SCRIPTS = libvirt-guests.sh
 
 if WITH_SANLOCK
@@ -35,11 +35,6 @@ if WITH_LOGIN_SHELL
 conf_DATA += virt-login-shell.conf
 endif WITH_LOGIN_SHELL
 
-virt-xml-validate: virt-xml-validate.in Makefile
-       $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
-                      -e 's|[@]VERSION@|$(VERSION)|g' \
-         < $< > $@ || (rm $@ && exit 1) && chmod +x $@
-
 virt-pki-validate: virt-pki-validate.in Makefile
        $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|g' \
                       -e 's|[@]VERSION@|$(VERSION)|g' \

diff --git a/tools/meson.build b/tools/meson.build
index 6217b36a3281a75a3adfdb36da34810e6e82a130..32f4d767d4807c8bffae7cbd4496ca946ad91dc5 100644 (file)
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -219,3 +219,16 @@ executable(
   install_dir: bindir,
   install_rpath: libdir,
 )
+
+tools_conf = configuration_data()
+tools_conf.set('VERSION', meson.project_version())
+tools_conf.set('schemadir', pkgdatadir / 'schemas')
+
+configure_file(
+  input: 'virt-xml-validate.in',
+  output: 'virt-xml-validate',
+  configuration: tools_conf,
+  install: true,
+  install_dir: bindir,
+  install_mode: 'rwxrwxr-x',
+)