[GRASS-SVN] r56248 - in grass/trunk: lib/init mswindows mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-05-14 05:20:20 -0700 (Tue, 14 May 2013)
New Revision: 56248

Removed:
   grass/trunk/mswindows/osgeo4w/ini.bat.tmpl
Modified:
   grass/trunk/lib/init/grass.py
   grass/trunk/mswindows/env.bat
   grass/trunk/mswindows/osgeo4w/env.bat.tmpl
   grass/trunk/mswindows/osgeo4w/grass.tmpl
Log:
remove GRASS_WISH, tcl/tk dependency has been removed

Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2013-05-14 09:11:11 UTC (rev 56247)
+++ grass/trunk/lib/init/grass.py	2013-05-14 12:20:20 UTC (rev 56248)
@@ -175,7 +175,6 @@
 
 %s:
   GRASS_GUI                      %s
-  GRASS_WISH                     %s
   GRASS_HTML_BROWSER             %s
   GRASS_ADDON_PATH               %s
   GRASS_ADDON_BASE               %s
@@ -200,7 +199,6 @@
        _("fully qualified initial mapset directory"),
        _("Environment variables relevant for startup"),
        _("select GUI (text, gui)"),
-       _("set wish shell name to override 'wish'"),
        _("set html web browser for help pages"),
        _("set additional path(s) to local GRASS modules or user scripts"),
        _("set additional GISBASE for locally installed GRASS Addons"),
@@ -397,10 +395,6 @@
             pager = "cat"
         os.environ['GRASS_PAGER'] = pager
     
-    # GRASS_WISH
-    if not os.getenv('GRASS_WISH'):
-        os.environ['GRASS_WISH'] = "wish"
-    
     # GRASS_PYTHON
     if not os.getenv('GRASS_PYTHON'):
         if windows:
@@ -1164,7 +1158,7 @@
 # Set LD_LIBRARY_PATH (etc) to find GRASS shared libraries
 path_prepend(gfile("lib"), ld_library_path_var)
 
-# Set GRASS_PAGER, GRASS_WISH, GRASS_PYTHON, GRASS_GNUPLOT, GRASS_PROJSHARE
+# Set GRASS_PAGER, GRASS_PYTHON, GRASS_GNUPLOT, GRASS_PROJSHARE
 set_defaults()
 
 # Set GRASS_HTML_BROWSER

Modified: grass/trunk/mswindows/env.bat
===================================================================
--- grass/trunk/mswindows/env.bat	2013-05-14 09:11:11 UTC (rev 56247)
+++ grass/trunk/mswindows/env.bat	2013-05-14 12:20:20 UTC (rev 56248)
@@ -1,6 +1,5 @@
 rem Environmental variables for GRASS stand-alone installer
 
-set GRASS_WISH=%GISBASE%\extrabin\wish.exe
 set GRASS_PYTHON=python
 set GRASS_PROJSHARE=%GISBASE%\proj
 set GRASS_HTML_BROWSER=explorer

Modified: grass/trunk/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/env.bat.tmpl	2013-05-14 09:11:11 UTC (rev 56247)
+++ grass/trunk/mswindows/osgeo4w/env.bat.tmpl	2013-05-14 12:20:20 UTC (rev 56248)
@@ -3,7 +3,6 @@
 set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
 
 set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
-set GRASS_WISH=%OSGEO4W_ROOT%\bin\wish.exe
 set GRASS_PYTHON=python
 set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
 set GRASS_HTML_BROWSER=explorer

Modified: grass/trunk/mswindows/osgeo4w/grass.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.tmpl	2013-05-14 09:11:11 UTC (rev 56247)
+++ grass/trunk/mswindows/osgeo4w/grass.tmpl	2013-05-14 12:20:20 UTC (rev 56248)
@@ -3,13 +3,12 @@
 OSGEO4W_ROOT_MSYS=@OSGEO4W_ROOT_MSYS@
 GISBASE=$OSGEO4W_ROOT_MSYS/apps/grass/grass- at VERSION@
 GRASS_SH=$OSGEO4W_ROOT_MSYS/apps/msys/bin/sh.exe
-GRASS_WISH=$OSGEO4W_ROOT_MSYS/bin/wish.exe
 GRASS_PYTHON=$OSGEO4W_ROOT_MSYS/bin/python.exe
 PYTHONHOME=$OSGEO4W_ROOT_MSYS/apps/Python27
 GRASS_PROJSHARE=$OSGEO4W_ROOT_MSYS/share/proj
 PATH=$OSGEO4W_ROOT_MSYS/apps/grass/grass- at VERSION@/bin:$PATH
 
-export $OSGEO4W_ROOT_MSYS $GISBASE $GRASS_SH $GRASS_WISH $GRASS_PYTHON $PYTHONHOME $GRASS_PROJSHARE
+export $OSGEO4W_ROOT_MSYS $GISBASE $GRASS_SH $GRASS_PYTHON $PYTHONHOME $GRASS_PROJSHARE
 export $PATH
 
 $GRASS_PYTHON "$GISBASE/etc/grass at POSTFIX@.py" "$@"

Deleted: grass/trunk/mswindows/osgeo4w/ini.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/ini.bat.tmpl	2013-05-14 09:11:11 UTC (rev 56247)
+++ grass/trunk/mswindows/osgeo4w/ini.bat.tmpl	2013-05-14 12:20:20 UTC (rev 56248)
@@ -1,7 +0,0 @@
-set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-7.0.0svn
-set WINGISBASE=%OSGEO4W_ROOT%\apps\grass\grass-7.0.0svn
-set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
-set GRASS_WISH=%OSGEO4W_ROOT%\bin\wish.exe
-set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe
-set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
-set GRASS_HTML_BROWSER=%PROGRAMFILES%\Internet Explorer\iexplore.exe