[2/3] win32/vd_agent: Customize MSI product name and install location

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

Details

Message ID 20191018133522.30080-3-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.
Customize these properties of WIX script during build under
WIXL or Windows.

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
---
 Makefile.am          | 5 ++++-
 spice-vdagent.wxs.in | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

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"