for ovirt use ovirt-guest-tools-setup Allow passing a custom DISPLAYED_VERSION and EXE_VERSION Change-Id: Id60a990aea8e9148c0cd47dd685f9681395ac624 Signed-off-by: Yedidyah Bar David <didi@xxxxxxxxxx> --- win-guest-tools.nsis | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/win-guest-tools.nsis b/win-guest-tools.nsis index 91295a9..4eb5c73 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" @@ -47,7 +48,7 @@ SetCompressor /SOLID lzma !define REGKEYNAME "SpiceGuestTools" !define URL "http://spice-space.org" !else ifdef OVIRT -!define FILENAME "win-guest-tools" +!define FILENAME "ovirt-guest-tools-setup" !define NAME "oVirt Guest Tools" !define PUBLISHER "The oVirt Project" !define REGKEYNAME "oVirtGuestTools" @@ -55,11 +56,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 "" @@ -185,7 +193,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 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel