[1/3] win32/vd_agent: Fix WIX error on .wxs script

Submitted by Yuri Benditovich on Oct. 18, 2019, 1:35 p.m.

Details

Message ID 20191018133522.30080-2-yuri.benditovich@daynix.com
State New
Headers show
Series "Make WIX script to be useful in Windows build" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Yuri Benditovich Oct. 18, 2019, 1:35 p.m.
Allows the same WIXL script to be used for WIX on Windows.
WIX raises error if Win64 property is not set for x64 MSI.

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
---
 spice-vdagent.wxs.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index 7432ca9..e0fd38e 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -39,10 +39,10 @@ 
       <Directory Id="$(var.ArchProgramFilesFolder)">
         <Directory Id="INSTALLDIR" Name="SPICE agent">
           <Directory Id="Dbindir" Name="bin">
-            <Component Id="CSpiceAgent" Guid="*">
+            <Component Id="CSpiceAgent" Guid="*" Win64="$(var.Win64)">
               <File Id='spiceagent' Name='vdagent.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdagent.exe' KeyPath='yes'/>
             </Component>
-            <Component Id="CSpiceService" Guid="*">
+            <Component Id="CSpiceService" Guid="*" Win64="$(var.Win64)">
               <File Id='spiceservice' Name='vdservice.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdservice.exe' KeyPath='yes'/>
               <ServiceInstall Id="ServiceInstall"
                             Name="spice-agent"