pxcloud/win32-vd_agent
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/win32-vd_agent synced 2026-01-08 20:57:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32/vd_agent: Customize MSI product name and install location

Browse Source 
Customize these properties of WIX script during build under
WIXL or Windows.

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Yuri Benditovich 2019-10-18 16:35:21 +03:00 committed by Frediano Ziglio
parent 886b9450a5
commit d8894046f8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -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 $@ $<

8
spice-vdagent.wxs.in
View File

@ -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"