[GRASS-SVN] r68578 - grass/branches/releasebranch_7_2/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-06-02 08:52:57 -0700 (Thu, 02 Jun 2016)
New Revision: 68578

Modified:
   grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: update nsi file to respect SVN_REVISION variable (merge r68577 from trunk)

Modified: grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl	2016-06-02 15:50:44 UTC (rev 68577)
+++ grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl	2016-06-02 15:52:57 UTC (rev 68578)
@@ -72,8 +72,8 @@
 	!define DISPLAYED_NAME "GRASS GIS ${VERSION_NUMBER}-${BINARY_REVISION} (${PLATFORM})"
 	!define CHECK_INSTALL_NAME "GRASS GIS @GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@"
 !else
-	!define INSTALLER_NAME "WinGRASS-${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}-Setup-${PLATFORM}.exe"
-	!define DISPLAYED_NAME "GRASS GIS ${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION} (${PLATFORM})"
+	!define INSTALLER_NAME "WinGRASS-${VERSION_NUMBER}-${SVN_REVISION}-${BINARY_REVISION}-Setup-${PLATFORM}.exe"
+	!define DISPLAYED_NAME "GRASS GIS ${VERSION_NUMBER}-${SVN_REVISION}-${BINARY_REVISION} (${PLATFORM})"
 	!define CHECK_INSTALL_NAME "GRASS GIS @GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@ SVN"
 !endif
 
@@ -636,7 +636,7 @@
 		"DisplayVersion" "${VERSION_NUMBER}-${BINARY_REVISION}"
 	!else
 		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}"\
-		"DisplayVersion" "${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}"
+		"DisplayVersion" "${VERSION_NUMBER}-${SVN_REVISION}-${BINARY_REVISION}"
 	!endif
 	
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "DisplayIcon" "$INSTALL_DIR\gui\icons\grass.ico"