[GRASS-SVN] r50235 - in grass/branches/develbranch_6: lib/init
mswindows mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jan 17 09:13:07 EST 2012
Author: martinl
Date: 2012-01-17 06:13:07 -0800 (Tue, 17 Jan 2012)
New Revision: 50235
Modified:
grass/branches/develbranch_6/lib/init/init.bat
grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
grass/branches/develbranch_6/mswindows/env.bat
grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl
Log:
winGRASS: clean up env.bat files (standalone + osgeo4w), create only one shortcut
Modified: grass/branches/develbranch_6/lib/init/init.bat
===================================================================
--- grass/branches/develbranch_6/lib/init/init.bat 2012-01-17 12:53:03 UTC (rev 50234)
+++ grass/branches/develbranch_6/lib/init/init.bat 2012-01-17 14:13:07 UTC (rev 50235)
@@ -26,7 +26,7 @@
rem DON'T include scripts directory in PATH - .bat files in bin directory
rem are used to run scripts on Windows
if "%GRASS_ADDON_PATH%"=="" set GRASS_ADDON_PATH=%APPDATA%\GRASS6\addons
-PATH=%WINGISBASE%\bin;%WINGISBASE%\lib;%GRASS_ADDON_PATH%;%PATH%
+PATH=%GISBASE%\bin;%GISBASE%\lib;%GRASS_ADDON_PATH%;%PATH%
set GIS_LOCK=1
set GRASS_VERSION=GRASS_VERSION_NUMBER
@@ -41,10 +41,10 @@
set GISRC=junk
rem Generate GISBASE by converting dirsep characters from \ to /
-FOR /F "usebackq delims==" %%i IN (`g.dirseps -g "%WINGISBASE%"`) DO @set GISBASE=%%i
+FOR /F "usebackq delims==" %%i IN (`g.dirseps -g "%GISBASE%"`) DO @set GISBASE=%%i
if not "%LANG%"=="" goto langset
-FOR /F "usebackq delims==" %%i IN (`"%WINGISBASE%\etc\winlocale"`) DO @set LANG=%%i
+FOR /F "usebackq delims==" %%i IN (`"%GISBASE%\etc\winlocale"`) DO @set LANG=%%i
:langset
set GRASS_PAGER=more
@@ -80,9 +80,9 @@
set HAVE_GISRC=false
rem Create an initial GISRC file based on current directory
-"%WINGISBASE%\etc\echo" "GISDBASE: %USERPROFILE%" | g.dirseps -g > "%WINGISRC%"
-"%WINGISBASE%\etc\echo" "LOCATION_NAME: <UNKNOWN>" >> "%WINGISRC%"
-"%WINGISBASE%\etc\echo" "MAPSET: <UNKNOWN>" >> "%WINGISRC%"
+"%GISBASE%\etc\echo" "GISDBASE: %USERPROFILE%" | g.dirseps -g > "%WINGISRC%"
+"%GISBASE%\etc\echo" "LOCATION_NAME: <UNKNOWN>" >> "%WINGISRC%"
+"%GISBASE%\etc\echo" "MAPSET: <UNKNOWN>" >> "%WINGISRC%"
:aftercreategisrc
@@ -102,7 +102,7 @@
rem Clean out old .tmp files from the mapset
if "%HAVE_GISRC%"=="true" (
- "%WINGISBASE%\etc\clean_temp" > NUL:
+ "%GISBASE%\etc\clean_temp" > NUL:
)
set HAVE_GISRC=
@@ -110,9 +110,9 @@
if "%GRASS_GUI%"=="wxpython" goto wxpython
if not "%GRASS_WISH%"=="" (
- "%GRASS_WISH%" "%WINGISBASE%\etc\gis_set.tcl"
+ "%GRASS_WISH%" "%GISBASE%\etc\gis_set.tcl"
) else (
- "%WINGISBASE%\etc\gis_set.tcl"
+ "%GISBASE%\etc\gis_set.tcl"
)
rem This doesn't seem to work; don't understand return codes from gis_set.tcl PK
@@ -121,19 +121,19 @@
rem Does line 42 above mean that GRASS_WISH will always be set?
if not "%GRASS_WISH%"=="" (
- start /b "GRASS Tcl/Tk" "%GRASS_WISH%" "%WINGISBASE%\etc\gm\gm.tcl"
+ start /b "GRASS Tcl/Tk" "%GRASS_WISH%" "%GISBASE%\etc\gm\gm.tcl"
) else (
- start /b "GRASS Tcl/Tk" "%WINGISBASE%\etc\gm\gm.tcl"
+ start /b "GRASS Tcl/Tk" "%GISBASE%\etc\gm\gm.tcl"
)
rem Will redirecting output to NUL hide legitamite error messages, harming debugging?
-"%WINGISBASE%\etc\clean_temp" > NUL:
+"%GISBASE%\etc\clean_temp" > NUL:
goto exitinit
:wxpython
-set PYTHONPATH=%PYTHONPATH%;%WINGISBASE%\etc\python;%WINGISBASE%\etc\wxpython
+set PYTHONPATH=%PYTHONPATH%;%GISBASE%\etc\python;%GISBASE%\etc\wxpython
python "%GISBASE%/etc/wxpython/gis_set.py"
if %errorlevel% == 2 goto exitinit
@@ -143,22 +143,22 @@
:text
-"%WINGISBASE%\etc\set_data"
+"%GISBASE%\etc\set_data"
if %errorlevel% == 1 goto exitinit
rem Get LOCATION_NAME to use in prompt
FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=LOCATION_NAME"`) DO @set LOCATION_NAME=%%i
-type "%WINGISBASE%\etc\welcome"
+type "%GISBASE%\etc\welcome"
-"%WINGISBASE%\etc\echo" ""
-"%WINGISBASE%\etc\echo" "GRASS homepage: http://grass.osgeo.org/"
-"%WINGISBASE%\etc\echo" "This version running thru: Windows Command Shell (cmd.exe)"
-"%WINGISBASE%\etc\echo" "When ready to quit enter: exit"
-"%WINGISBASE%\etc\echo" "Help is available with the command: g.manual -i"
-"%WINGISBASE%\etc\echo" "See the licence terms with: g.version -c"
-"%WINGISBASE%\etc\echo" ""
+"%GISBASE%\etc\echo" ""
+"%GISBASE%\etc\echo" "GRASS homepage: http://grass.osgeo.org/"
+"%GISBASE%\etc\echo" "This version running thru: Windows Command Shell (cmd.exe)"
+"%GISBASE%\etc\echo" "When ready to quit enter: exit"
+"%GISBASE%\etc\echo" "Help is available with the command: g.manual -i"
+"%GISBASE%\etc\echo" "See the licence terms with: g.version -c"
+"%GISBASE%\etc\echo" ""
prompt GRASS %GRASS_VERSION% $C%LOCATION_NAME%$F$G
@@ -169,7 +169,7 @@
:displaylicence
-type "%WINGISBASE%\etc\license"
+type "%GISBASE%\etc\license"
goto exitinit
:settextmode
@@ -194,7 +194,7 @@
:exitinit
rem Clean out old .tmp files from the mapset
-"%WINGISBASE%\etc\clean_temp" > NUL:
+"%GISBASE%\etc\clean_temp" > NUL:
set PATH=%SAVEPATH%
set SAVEPATH=
Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi 2012-01-17 12:53:03 UTC (rev 50234)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi 2012-01-17 14:13:07 UTC (rev 50235)
@@ -574,10 +574,7 @@
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/${GRASS_COMMAND} -wx"\
- "$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
-
+
;Create the Windows Start Menu Shortcuts
SetShellVarContext all
@@ -598,7 +595,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/${GRASS_COMMAND} -wx"\
+ CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS GUI with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/${GRASS_COMMAND}.sh -wx"\
"$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
@@ -691,7 +688,7 @@
;create the $INSTALL_DIR\bin grass_command
ClearErrors
- FileOpen $0 $INSTALL_DIR\${GRASS_COMMAND} w
+ FileOpen $0 $INSTALL_DIR\${GRASS_COMMAND}.sh w
IfErrors done_create_grass_command
FileWrite $0 '#! /bin/sh$\r$\n'
FileWrite $0 '#########################################################################$\r$\n'
Modified: grass/branches/develbranch_6/mswindows/env.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/env.bat 2012-01-17 12:53:03 UTC (rev 50234)
+++ grass/branches/develbranch_6/mswindows/env.bat 2012-01-17 14:13:07 UTC (rev 50235)
@@ -1,35 +1,16 @@
-set WINGISBASE=%GISBASE%
+rem Environmental variables for GRASS stand-alone installer
-rem Directory where your .grassrc6 file will be stored
-set HOME=%USERPROFILE%
-
-rem Name of the wish (Tk) executable
-set GRASS_WISH=wish.exe
-
-rem Path to the shell command
-set GRASS_SH=%GISBASE%\msys\bin\sh.exe
-
-rem Set Path to utilities (libraries and binaries) used by GRASS
-set PATH=%GISBASE%\msys\bin;%PATH%
-set PATH=%GISBASE%\extrabin;%GISBASE%\extralib;%PATH%
-set PATH=%GISBASE%\tcl-tk\bin;%GISBASE%\sqlite\bin;%GISBASE%\gpsbabel;%PATH%
-set PATH=%GISBASE%\bin;%GISBASE%\scripts;%PATH%
-
-rem Set Path to default web browser
+set GRASS_WISH=%GISBASE%\extrabin\wish.exe
+set GRASS_PYTHON=python
+set GRASS_PROJSHARE=%GISBASE%\proj
set GRASS_HTML_BROWSER=explorer
-rem Path to the proj files (notably the epsg projection list)
-set GRASS_PROJSHARE=%GISBASE%\proj
-
-rem Set GDAL_DATA
+set PYTHONHOME=%GISBASE%\Python25
set GDAL_DATA=%GISBASE%\share\gdal
-
-rem Set PROJ_LIB
set PROJ_LIB=%GISBASE%\proj
-
-rem Set GEOTIFF_CSV
set GEOTIFF_CSV=%GISBASE%\share\epsg_csv
-rem Path to the python directory
-set PYTHONHOME=%GISBASE%\Python25
-if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python
+set PATH=%GISBASE%\msys\bin;%PATH%
+set PATH=%GISBASE%\extrabin;%GISBASE%\extralib;%PATH%
+set PATH=%GISBASE%\tcl-tk\bin;%GISBASE%\sqlite\bin;%GISBASE%\gpsbabel;%PATH%
+set PATH=%GISBASE%\bin;%PATH%
Modified: grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl 2012-01-17 12:53:03 UTC (rev 50234)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/env.bat.tmpl 2012-01-17 14:13:07 UTC (rev 50235)
@@ -1,8 +1,16 @@
+rem Environmental variables for GRASS OSGeo4W installer
+
set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
-set WINGISBASE=%GISBASE%
+
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_PYTHON=python
set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
set GRASS_HTML_BROWSER=explorer
-set PATH=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\bin;%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\lib;%PATH%
\ No newline at end of file
+
+set PYTHONHOME=%OSGEO4W_ROOT%\apps\Python25
+set GDAL_DATA=%OSGEO4W_ROOT%\share\gdal
+set PROJ_LIB=%OSGEO4W_ROOT%\proj
+set GEOTIFF_CSV=%OSGEO4W_ROOT%\share\epsg_csv
+
+set PATH=%GISBASE%\bin;%PATH%
More information about the grass-commit
mailing list