[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 2/8] qemu-ga: add missing libpcre to MSI build
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL v2 2/8] qemu-ga: add missing libpcre to MSI build |
Date: |
Tue, 18 Jul 2017 06:01:38 -0500 |
From: Thomas Lamprecht <address@hidden>
glib depends on libpcre which was not shipped with the MSI, thus
starting of the qemu-ga.exe failed with the respective error message.
Tell WIXL to ship this library with the MSI to avoid this problem.
Signed-off-by: Thomas Lamprecht <address@hidden>
CC: Stefan Weil <address@hidden>
CC: Michael Roth <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
qga/installer/qemu-ga.wxs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index fa2260c..5af1162 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -125,6 +125,9 @@
<Component Id="libwinpthread"
Guid="{6C117C78-0F47-4B07-8F34-6BEE11643829}">
<File Id="libwinpthread_1.dll" Name="libwinpthread-1.dll"
Source="$(var.Mingw_bin)/libwinpthread-1.dll" KeyPath="yes" DiskId="1"/>
</Component>
+ <Component Id="libpcre"
Guid="{7A86B45E-A009-489A-A849-CE3BACF03CD0}">
+ <File Id="libpcre_1.dll" Name="libpcre-1.dll"
Source="$(var.Mingw_bin)/libpcre-1.dll" KeyPath="yes" DiskId="1"/>
+ </Component>
<Component Id="registry_entries"
Guid="{D075D109-51CA-11E3-9F8B-000C29858960}">
<RegistryKey Root="HKLM"
Key="Software\$(env.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\QemuGA">
@@ -173,6 +176,7 @@
<ComponentRef Id="libssp" />
<ComponentRef Id="libwinpthread" />
<ComponentRef Id="registry_entries" />
+ <ComponentRef Id="libpcre" />
</Feature>
<InstallExecuteSequence>
--
2.7.4
- [Qemu-devel] [PULL v2 0/8] qemu-ga patch queue, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 1/8] qga-win: fix installation on localized windows, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 2/8] qemu-ga: add missing libpcre to MSI build,
Michael Roth <=
- [Qemu-devel] [PULL v2 8/8] test-qga: add test for guest-get-osinfo, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 5/8] qga: report error on keyfile dump error, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 7/8] test-qga: pass environemnt to qemu-ga, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 4/8] qga-win32: remove a redundancy code, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 3/8] qemu-ga: check if utmpx.h is available on the system, Michael Roth, 2017/07/18
- [Qemu-devel] [PULL v2 6/8] qemu-ga: add guest-get-osinfo command, Michael Roth, 2017/07/18
- Re: [Qemu-devel] [PULL v2 0/8] qemu-ga patch queue, Peter Maydell, 2017/07/18