[GRASS-SVN] r48752 - grass/branches/develbranch_6/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-12 04:13:33 -0700 (Wed, 12 Oct 2011)
New Revision: 48752

Modified:
   grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl
   grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
Log:
fix grass.bat.tmpl (OSGeo4W)
winGRASS: cleanup start items, only one Desktop shorcut


Modified: grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl	2011-10-12 11:11:32 UTC (rev 48751)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl	2011-10-12 11:13:33 UTC (rev 48752)
@@ -1,5 +1,5 @@
 @echo off
-SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
+SET OSGEO4W_ROOT=@osgeo4w@
 call %OSGEO4W_ROOT%\bin\o4w_env.bat
 call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
 "%WINGISBASE%"\etc\init.bat %*

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat	2011-10-12 11:11:32 UTC (rev 48751)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/postinstall.bat	2011-10-12 11:13:33 UTC (rev 48752)
@@ -5,10 +5,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@\wxPython @VERSION at .lnk"   "%BATCH%" "-wxpython" \ "wxPython interface" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\TclTk @VERSION at .lnk"     "%BATCH%" "-tcltk" \ "Tcl/Tk interface" 1 "%ICON%" 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\Text @VERSION at .lnk"       "%BATCH%" "-text" \ "Text interface" 1 "%ICON%" 
+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 "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (wxpython).lnk" "%BATCH%" "-wxpython" \ "wxPython" 1 "%ICON%" 
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (TclTk).lnk" "%BATCH%" "-tcltk" \ "Tcl/Tk" 1 "%ICON%" 
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (Text).lnk" "%BATCH%" "-text" \ "Text interface" 1 "%ICON%" 
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-wx" \ "Graphical User Interface (wxGUI)" 1 "%ICON%"