[Spice-devel] [NSIS 1/2] Allow custom installer filename and displayed name version

[Yedidyah Bar David]

Allow passing:

DISPLAYED_VERSION (defaults to $VERSION): what's written to the
registry. This is what is shown to the user e.g. in the control panel.

EXE_VERSION (defaults to -$VERSION): appended to installer filename.

Not touching VERSION, which reflects the version of the installer's
source code.

Change-Id: Id60a990aea8e9148c0cd47dd685f9681395ac624
Signed-off-by: Yedidyah Bar David <didi at redhat.com>
---
 win-guest-tools.nsis | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/win-guest-tools.nsis b/win-guest-tools.nsis
index 8b52e26..4e34d2e 100644
--- a/win-guest-tools.nsis
+++ b/win-guest-tools.nsis
@@ -40,6 +40,7 @@ SetCompressor /SOLID lzma
 !include "WinVer.nsh"
 !include "x64.nsh"
 
+
 !ifdef SPICE
 !define FILENAME "spice-guest-tools"
 !define NAME "SPICE Guest Tools"
@@ -57,11 +58,18 @@ SetCompressor /SOLID lzma
 !else
 !error "OVIRT or SPICE symbol should passed to makensis with the -D flag"
 !endif
+
 !define VERSION "0.103"
+!ifndef DISPLAYED_VERSION
+!define DISPLAYED_VERSION "${VERSION}"
+!endif
+!ifndef EXE_VERSION
+!define EXE_VERSION "-${VERSION}"
+!endif
 
 Name "${NAME}"
 Caption "${NAME} Installer"
-OutFile "${FILENAME}-${VERSION}.exe"
+OutFile "${FILENAME}${EXE_VERSION}.exe"
 InstallDir "$PROGRAMFILES\${NAME}"
 BrandingText "${BRANDINGTEXT}"
 
@@ -187,7 +195,7 @@ Section "install"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${REGKEYNAME}" \
                  "DisplayName" "${NAME}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${REGKEYNAME}" \
-                 "DisplayVersion" "${VERSION}"
+                 "DisplayVersion" "${DISPLAYED_VERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${REGKEYNAME}" \
                  "Publisher" "${PUBLISHER}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${REGKEYNAME}" \
-- 
2.1.4