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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-16 02:29:56 -0700 (Sun, 16 Oct 2011)
New Revision: 48824

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
   grass/trunk/mswindows/osgeo4w/preremove.bat
Log:
winGRASS: minor fixes in support scripts

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2011-10-16 09:24:27 UTC (rev 48823)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2011-10-16 09:29:56 UTC (rev 48824)
@@ -651,18 +651,18 @@
 
 	; not working after changing to start Grass7 by grass70.py
 	;CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER} with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/bin/${GRASS_COMMAND} -wxpython"\
-	;"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
+	;"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and a MSYS UNIX terminal"
 					
 	; new attempt to get Grass70-wx-gui and a working msys-shell in a windows command line
 	CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER} with MSYS.lnk" "$INSTALL_DIR\set_shell_start_${GRASS_COMMAND}.bat" ""\
-	"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS-Windows-commandline"
+	"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and a MSYS-Windows-commandline"
  	
 	;Create the Windows Start Menu Shortcuts
 	SetShellVarContext all
 	
 	CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
 	
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
 	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI"
 
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Command Line.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-text"\
@@ -674,7 +674,7 @@
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Web Site.lnk" "$INSTALL_DIR\GRASS-WebSite.url" ""\
 	"$INSTALL_DIR\icons\GRASS_Web.ico" "" SW_SHOWNORMAL "" "Visit the GRASS website"
 	
-	;CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/bin/${GRASS_COMMAND} -wxpython"\
+	;CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/bin/${GRASS_COMMAND} -wx"\
 	;"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with wxGUI and a MSYS UNIX terminal"
 
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\set_shell_start_${GRASS_COMMAND}.bat" ""\

Modified: grass/trunk/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/trunk/mswindows/osgeo4w/preremove.bat	2011-10-16 09:24:27 UTC (rev 48823)
+++ grass/trunk/mswindows/osgeo4w/preremove.bat	2011-10-16 09:29:56 UTC (rev 48824)
@@ -4,6 +4,7 @@
 
 del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk"
 
-del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
+del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.py
 del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.bat
 del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap