From: Yuri Pudgorodskiy <y...@virtuozzo.com>
With previous commit we added gspawn-win64-helper-console.exe,
required for gspawn() mingw implementation.
Unfortunatly when running as a service without interactive
desktop, gspawn() also requires another helper app.
Added gspawn-win64-helper.exe and gspawn-win32-helper.exe
for corresponding architectures.
Signed-off-by: Yuri Pudgorodskiy <y...@virtuozzo.com>
Signed-off-by: Denis V. Lunev <d...@openvz.org>
CC: Michael Roth <mdr...@linux.vnet.ibm.com>
* remove trailing whitespace
Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
---
qga/installer/qemu-ga.wxs | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index f25afdd..9473875 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -95,11 +95,17 @@
<Component Id="gspawn-helper-console"
Guid="{446185B3-87BE-43D2-96B8-0FEFD9E8696D}">
<File Id="gspawn-win32-helper-console.exe"
Name="gspawn-win32-helper-console.exe"
Source="$(var.Mingw_bin)/gspawn-win32-helper-console.exe" KeyPath="yes"
DiskId="1"/>
</Component>
+ <Component Id="gspawn-helper"
Guid="{CD67A5A3-2DB1-4DA1-A67A-8D71E797B466}">
+ <File Id="gspawn-win32-helper.exe" Name="gspawn-win32-helper.exe"
Source="$(var.Mingw_bin)/gspawn-win32-helper.exe" KeyPath="yes" DiskId="1"/>
+ </Component>
<?endif?>
<?if $(var.Arch) = "64"?>
<Component Id="gspawn-helper-console"
Guid="{9E615A9F-349A-4992-A5C2-C10BAD173660}">
<File Id="gspawn-win64-helper-console.exe"
Name="gspawn-win64-helper-console.exe"
Source="$(var.Mingw_bin)/gspawn-win64-helper-console.exe" KeyPath="yes"
DiskId="1"/>
</Component>
+ <Component Id="gspawn-helper"
Guid="{D201AD22-1846-4E4F-B6E1-C7A908ED2457}">
+ <File Id="gspawn-win64-helper.exe" Name="gspawn-win64-helper.exe"
Source="$(var.Mingw_bin)/gspawn-win64-helper.exe" KeyPath="yes" DiskId="1"/>
+ </Component>
<?endif?>
<Component Id="iconv" Guid="{35EE3558-D34B-4F0A-B8BD-430FF0775246}">
<File Id="iconv.dll" Name="iconv.dll"
Source="$(var.Mingw_bin)/iconv.dll" KeyPath="yes" DiskId="1"/>
@@ -159,6 +165,7 @@
<ComponentRef Id="qga_vss_tlb" />
<?endif?>
<ComponentRef Id="gspawn-helper-console" />
+ <ComponentRef Id="gspawn-helper" />
<ComponentRef Id="iconv" />
<ComponentRef Id="libgcc_arch_lib" />
<ComponentRef Id="libglib" />
--
1.9.1
