summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-07-30 21:05:28 +0200
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-07-30 21:08:26 +0200
commitc8e5b8e3b035cb953f66702c6a5f903df26c3a15 (patch)
treee4f852f1f8feb1f3059438fbcadd56f8ab658268 /data
parent460a463c815ecbeeb81b649e15e45dc7467bbb07 (diff)
downloadvirt-viewer-c8e5b8e3b035cb953f66702c6a5f903df26c3a15.tar.gz
virt-viewer-c8e5b8e3b035cb953f66702c6a5f903df26c3a15.tar.xz
virt-viewer-c8e5b8e3b035cb953f66702c6a5f903df26c3a15.zip
msi: use ProductVersion compatible with Windows Installer
Windows Installer expects version of form major.minor.build in order to perform updates. Following Daniel Berrange suggestion, compute a ProductVersion compatible with this scheme by shifting virt-viewer "micro" release number and adding the extra "buildid".
Diffstat (limited to 'data')
-rw-r--r--data/virt-viewer.wxs.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
index 98a56f1..438f341 100644
--- a/data/virt-viewer.wxs.in
+++ b/data/virt-viewer.wxs.in
@@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?define Version = "@VERSION@"?>
+ <?define Version = "@WINDOWS_PRODUCTVERSION@"?>
<?define Arch = "@WIXL_ARCH@"?>
<?if $(var.Arch) = "x64"?>
<?define GLIB_ARCH = "win64"?>
@@ -22,7 +22,7 @@
<?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?>
<Product Id="*"
- Name="VirtViewer $(var.Version) ($(var.ArchString))"
+ Name="VirtViewer @VERSION@@BUILDID@ ($(var.ArchString))"
Manufacturer="$(env.MANUFACTURER)"
Version="$(var.Version)"
UpgradeCode="$(var.UpgradeCode)"