[GRASS-SVN] r50391 - in grass/trunk/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-01-23 05:06:34 -0800 (Mon, 23 Jan 2012)
New Revision: 50391

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
   grass/trunk/mswindows/osgeo4w/postinstall.bat
   grass/trunk/mswindows/osgeo4w/preremove.bat
Log:
winGRASS: show version in menu items (to avoid mismatch when more versions is installed)

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2012-01-23 13:06:10 UTC (rev 50390)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2012-01-23 13:06:34 UTC (rev 50391)
@@ -635,13 +635,13 @@
 	
 	CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
 	
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER} GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
 	"$INSTALL_DIR\etc\gui\icons\grass.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and CMD console"
 
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\${GRASS_COMMAND}_msys.bat" "-wx"\
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER} GUI with MSYS.lnk" "$INSTALL_DIR\${GRASS_COMMAND}_msys.bat" "-wx"\
 	"$INSTALL_DIR\etc\gui\icons\grass_msys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and MSYS UNIX console"
 
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Command Line.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-text"\
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER} Command Line.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-text"\
 	"$INSTALL_DIR\etc\gui\icons\grass_cmd.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} in text mode"
 
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\MSYS UNIX Console.lnk" "$INSTALL_DIR\msys\msys.bat" ""\

Modified: grass/trunk/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/postinstall.bat	2012-01-23 13:06:10 UTC (rev 50390)
+++ grass/trunk/mswindows/osgeo4w/postinstall.bat	2012-01-23 13:06:34 UTC (rev 50391)
@@ -6,8 +6,8 @@
 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 
 mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS GUI.lnk"   "%BATCH%" "-gui" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Command Line.lnk"  "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON_CMD%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk"   "%BATCH%" "-gui" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk"  "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON_CMD%" 
 
 xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%"  "-gui" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
 

Modified: grass/trunk/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/preremove.bat	2012-01-23 13:06:10 UTC (rev 50390)
+++ grass/trunk/mswindows/osgeo4w/preremove.bat	2012-01-23 13:06:34 UTC (rev 50391)
@@ -1,5 +1,5 @@
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS GUI.lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Command Line.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk"
 rmdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
 
 del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk"