[GRASS-SVN] r48821 - in grass/branches/develbranch_6/mswindows: . osgeo4w

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Oct 15 16:12:48 EDT 2011 

Author: martinl
Date: 2011-10-15 13:12:47 -0700 (Sat, 15 Oct 2011)
New Revision: 48821

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
   grass/branches/develbranch_6/mswindows/osgeo4w/grass.tmpl
   grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
   grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat
Log:
winGRASS: clean up support files for osgeo4w

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2011-10-15 20:10:17 UTC (rev 48820)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2011-10-15 20:12:47 UTC (rev 48821)
@@ -583,8 +583,8 @@
 	;Create the Desktop Shortcut
 	SetShellVarContext current
 	
-	CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI"
+	CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
+	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with wxGUI"
 
 	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"
@@ -597,11 +597,11 @@
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Old TclTk GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-tcltk"\
 	"$INSTALL_DIR\icons\GRASS_tcltk.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the old TclTk GUI"
 
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI"
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
+	"$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"\
-	"$INSTALL_DIR\icons\GRASS_CMD.ico" "" SW_SHOWNORMAL "" "Launch GRASS in text mode"
+	"$INSTALL_DIR\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" ""\
 	"$INSTALL_DIR\icons\MSYS_Custom_Icon.ico" "" SW_SHOWNORMAL "" "Open a MSYS UNIX console"
@@ -609,8 +609,8 @@
 	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 ${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"
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI 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 wxGUI and a MSYS UNIX terminal"
 	
 ; FIXME: ship the WinGrass release notes .html file instead of URL
 ; http://trac.osgeo.org/grass/browser/grass-web/trunk/grass65/binary/mswindows/native/README.html?format=raw

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/grass.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass.tmpl	2011-10-15 20:10:17 UTC (rev 48820)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass.tmpl	2011-10-15 20:12:47 UTC (rev 48821)
@@ -19,7 +19,7 @@
 trap "echo 'User break!' ; exit" 2 3 9 15
 
 # Set the GISBASE variable
-GISBASE="@OSGEO4W_ROOT@\apps\grass\grass- at VERSION@"
+GISBASE="@osgeo4w@/apps/grass/grass- at VERSION@"
 export GISBASE
 
 exec "$GISBASE/etc/Init.sh" "$@"

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat	2011-10-15 20:10:17 UTC (rev 48820)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat	2011-10-15 20:12:47 UTC (rev 48821)
@@ -1,12 +1,15 @@
 set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass.ico
 set BATCH=%OSGEO4W_ROOT%\bin\grass at POSTFIX@.bat
 textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@ 
-textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap 
+textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@
+textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 
 mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\wxGUI @VERSION at .lnk"   "%BATCH%" "-wx" \ "Graphical User Interface (wxGUI)" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\TclTk @VERSION at .lnk"   "%BATCH%" "-tcltk" \ "Graphical User Interface (Tcl/Tk)" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\Text @VERSION at .lnk"    "%BATCH%" "-text" \ "Text User Interface (CLI)" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS GUI.lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Old TclTk GUI.lnk" "%BATCH%" "-tcltk" \ "Launch GRASS GIS @VERSION@ with the old TclTk GUI" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON%" 
 
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-wx" \ "Graphical User Interface (wxGUI)" 1 "%ICON%" 
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%" 
+
+del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.bat.tmpl
+del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@.tmpl

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat	2011-10-15 20:10:17 UTC (rev 48820)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/preremove.bat	2011-10-15 20:12:47 UTC (rev 48821)
@@ -1,10 +1,10 @@
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\wxGUI @VERSION at .lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\TclTk @VERSION at .lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\Text @VERSION at .lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS GUI.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Old TclTk GUI.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS Command Line.lnk"
 rmdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
 
 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@.bat
-del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@
+del "%OSGEO4W_ROOT%"\bin\grass at POSTFIX@

More information about the grass-commit mailing list