aboutsummaryrefslogtreecommitdiff
path: root/qga
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-07-15 13:06:20 +0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-08-21 06:30:12 -0400
commit328ec32d7d5b3c2aa2ecfe974e01bcbe3c5a46ac (patch)
tree204e29197a0011a6c778b81daea1d1f05bda0f24 /qga
parent7272fc72682c2573c67136e2c175d33d00d8905b (diff)
downloadqemu-328ec32d7d5b3c2aa2ecfe974e01bcbe3c5a46ac.zip
qemu-328ec32d7d5b3c2aa2ecfe974e01bcbe3c5a46ac.tar.gz
qemu-328ec32d7d5b3c2aa2ecfe974e01bcbe3c5a46ac.tar.bz2
meson: add msi generation
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qga')
-rw-r--r--qga/meson.build25
-rw-r--r--qga/vss-win32/meson.build3
2 files changed, 27 insertions, 1 deletions
diff --git a/qga/meson.build b/qga/meson.build
index 9ddb260..33f6db2 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -48,5 +48,30 @@ qga = executable('qemu-ga', qga_ss.sources(),
if targetos == 'windows'
if 'CONFIG_QGA_VSS' in config_host
subdir('vss-win32')
+ else
+ gen_tlb = []
+ endif
+
+ wixl = find_program('wixl', required: false)
+ if wixl.found()
+ deps = [gen_tlb, qga]
+ if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in config_host
+ deps += qga_vss
+ endif
+ qga_msi = custom_target('QGA MSI',
+ input: files('installer/qemu-ga.wxs'),
+ output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
+ depends: deps,
+ command: [
+ 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
+ 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
+ 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
+ 'BUILD_DIR=' + meson.build_root(),
+ wixl, '-o', '@OUTPUT0@', '@INPUT0@',
+ config_host['QEMU_GA_MSI_ARCH'].split(),
+ config_host['QEMU_GA_MSI_WITH_VSS'].split(),
+ config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
+ ])
+ alias_target('msi', qga_msi)
endif
endif
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 42c8d31..1f39e05 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -2,7 +2,8 @@ if add_languages('cpp', required: false)
glib_static = dependency('glib-2.0', static: true)
link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
'-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
- shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
+
+ qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
name_prefix: '',
cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
link_args: link_args,