[Spice-commits] 3 commits - Makefile.am spice-vdagent.wxs.in

[GitLab Mirror]

 Makefile.am          |    5 ++++-
 spice-vdagent.wxs.in |   17 +++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 66d44f914c67544444b0a6296b597bf7f75de8c0
Author: Yuri Benditovich <yuri.benditovich at daynix.com>
Date:   Fri Oct 18 16:35:22 2019 +0300

    win32/vd_agent: Optionally disable installation of x86 MSI on x64 system
    
    Currently the MSI built for x86 system can be easily installed
    on x64 system. When the script is processed by WIX this can be
    prevented by passing '-dNoWOW=yes' to the WIX-candle.
    
    Signed-off-by: Yuri Benditovich <yuri.benditovich at daynix.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index 7778c27..c451f13 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -31,6 +31,11 @@
       <UpgradeVersion Minimum="0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
     </Upgrade>
     <Condition Message="Product already installed.">NOT NEWERVERSIONDETECTED</Condition>
+    <?if $(var.Win64) = no AND $(var.NoWOW) = yes ?>
+      <Condition Message="Error: 32-bit version of $(env.PRODUCT) can not be installed on 64-bit Windows.">
+          <![CDATA[Not VersionNT64]]>
+      </Condition>
+    <?endif?>
     <InstallExecuteSequence>
       <RemoveExistingProducts After="InstallFinalize"/>
     </InstallExecuteSequence>
commit d8894046f8baee37a3822e2cd0b5b986b6ea33de
Author: Yuri Benditovich <yuri.benditovich at daynix.com>
Date:   Fri Oct 18 16:35:21 2019 +0300

    win32/vd_agent: Customize MSI product name and install location
    
    Customize these properties of WIX script during build under
    WIXL or Windows.
    
    Signed-off-by: Yuri Benditovich <yuri.benditovich at daynix.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 3020824..80e82c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ test_log_win_SOURCES =			\
 	$(NULL)
 
 MANUFACTURER = The Spice Project
+PRODUCT = Spice agent
 
 EXTRA_DIST += spice-vdagent.wxs.in
 CONFIG_STATUS_DEPENDENCIES = spice-vdagent.wxs.in
@@ -108,7 +109,9 @@ CONFIG_STATUS_DEPENDENCIES = spice-vdagent.wxs.in
 spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs all
 	$(AM_V_GEN)DESTDIR=`mktemp -d`&&				\
 	make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null &&	\
-	MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix)	\
+	  MANUFACTURER="$(MANUFACTURER)" PRODUCT="$(PRODUCT)"           \
+	  INSTALLDIRECTORY="$(PRODUCT)" BINDIRECTORY=bin                \
+	  wixl -D SourceDir=$(prefix)                                   \
 	  -D DESTDIR=$$DESTDIR$(prefix)					\
 	  --arch $(WIXL_ARCH)  -o $@ $<
 
diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index e0fd38e..7778c27 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -15,7 +15,7 @@
       <?define Win64 = "no"?>
   <?endif?>
 
-  <Product Id="*" Name="Spice agent @VERSION@@BUILDID@ ($(var.ArchString))"
+  <Product Id="*" Name="$(env.PRODUCT) @VERSION@@BUILDID@ ($(var.ArchString))"
            Manufacturer="$(env.MANUFACTURER)"
            Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)"
            Language="1033">
@@ -37,8 +37,8 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.ArchProgramFilesFolder)">
-        <Directory Id="INSTALLDIR" Name="SPICE agent">
-          <Directory Id="Dbindir" Name="bin">
+        <Directory Id="INSTALLDIR" Name="$(env.INSTALLDIRECTORY)">
+          <Directory Id="Dbindir" Name="$(env.BINDIRECTORY)">
             <Component Id="CSpiceAgent" Guid="*" Win64="$(var.Win64)">
               <File Id='spiceagent' Name='vdagent.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdagent.exe' KeyPath='yes'/>
             </Component>
@@ -46,7 +46,7 @@
               <File Id='spiceservice' Name='vdservice.exe' DiskId='1' Source='$(var.DESTDIR)/bin/vdservice.exe' KeyPath='yes'/>
               <ServiceInstall Id="ServiceInstall"
                             Name="spice-agent"
-                            DisplayName="Spice agent"
+                            DisplayName="$(env.PRODUCT)"
                             Description="The Spice guest agent"
                             Type="ownProcess"
                             Start="auto"
commit 886b9450a51683bb8e242117ad4754bdba0bf4fd
Author: Yuri Benditovich <yuri.benditovich at daynix.com>
Date:   Fri Oct 18 16:35:20 2019 +0300

    win32/vd_agent: Fix WIX error on .wxs script
    
    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 at daynix.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

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"