[GRASS-SVN] r67124 - in grass/trunk: gui/icons mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-14 12:24:58 -0800 (Mon, 14 Dec 2015)
New Revision: 67124

Added:
   grass/trunk/gui/icons/grass64bit.ico
   grass/trunk/gui/icons/grass64bit_osgeo.ico
Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: add special icon for 64bit installation

Added: grass/trunk/gui/icons/grass64bit.ico
===================================================================
(Binary files differ)


Property changes on: grass/trunk/gui/icons/grass64bit.ico
___________________________________________________________________
Added: svn:mime-type
   + image/x-icon

Added: grass/trunk/gui/icons/grass64bit_osgeo.ico
===================================================================
(Binary files differ)


Property changes on: grass/trunk/gui/icons/grass64bit_osgeo.ico
___________________________________________________________________
Added: svn:mime-type
   + image/x-icon

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-12-14 20:13:39 UTC (rev 67123)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-12-14 20:24:58 UTC (rev 67124)
@@ -36,11 +36,13 @@
         !define GRASS_COMMAND "grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at svn"
 !endif
 
-; Platform
+; Platform and GRASS Icon
 !if "%1" == "64"
-    !define PLATFORM "x86_64"
+    !define PLATFORM   "x86_64"
+    !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass64bit.ico"
 !else
     !define PLATFORM "x86"
+    !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass.ico"
 !endif
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -635,7 +637,7 @@
 		"DisplayVersion" "${VERSION_NUMBER}-r${SVN_REVISION}-${BINARY_REVISION}"
 	!endif
 	
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "DisplayIcon" "$INSTALL_DIR\gui\icons\grass.ico"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "DisplayIcon" "${GRASS_ICON}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "EstimatedSize" 1
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "HelpLink" "${WIKI_PAGE}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "URLInfoAbout" "${WEB_SITE}"
@@ -646,7 +648,7 @@
 	SetShellVarContext current
 	
 	CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
-	"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
+	"${GRASS_ICON}" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
 	
 	;Create the Windows Start Menu Shortcuts
 	SetShellVarContext all
@@ -654,7 +656,7 @@
 	CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
-	"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
+	"${GRASS_ICON}" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Uninstall ${GRASS_BASE}.lnk" "$INSTALL_DIR\Uninstall-GRASS.exe" ""\
 	"$INSTALL_DIR\Uninstall-GRASS.exe" "" SW_SHOWNORMAL "" "Uninstall GRASS GIS ${VERSION_NUMBER}"