[GRASS-SVN] r45598 - in grass/branches/releasebranch_6_4: lib/init
mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Mar 7 12:44:44 EST 2011
Author: martinl
Date: 2011-03-07 09:44:44 -0800 (Mon, 07 Mar 2011)
New Revision: 45598
Added:
grass/branches/releasebranch_6_4/mswindows/env.bat
Modified:
grass/branches/releasebranch_6_4/lib/init/init.bat
grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
Log:
winGRASS: move environmental variables to env.bat, init.bat: wxGUI default
(merge r45596 from devbr6)
Modified: grass/branches/releasebranch_6_4/lib/init/init.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.bat 2011-03-07 17:39:00 UTC (rev 45597)
+++ grass/branches/releasebranch_6_4/lib/init/init.bat 2011-03-07 17:44:44 UTC (rev 45598)
@@ -93,8 +93,8 @@
g.gisenv "set=GRASS_GUI=%GRASS_GUI%"
)
-rem Set tcltk as default if not specified elsewhere
-if "%GRASS_GUI%"=="" set GRASS_GUI=tcltk
+rem Set wxGUI as default if not specified elsewhere
+if "%GRASS_GUI%"=="" set GRASS_GUI=wxpython
rem Clean out old .tmp files from the mapset
if "%HAVE_GISRC%"=="true" (
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi 2011-03-07 17:39:00 UTC (rev 45597)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi 2011-03-07 17:44:44 UTC (rev 45598)
@@ -631,7 +631,6 @@
FileWrite $0 'rem #########################################################################$\r$\n'
FileWrite $0 'rem #$\r$\n'
FileWrite $0 'rem # File dynamically created by NSIS installer script;$\r$\n'
- FileWrite $0 'rem # Written by Marco Pasetti;$\r$\n'
FileWrite $0 'rem #$\r$\n'
FileWrite $0 'rem #########################################################################$\r$\n'
FileWrite $0 'rem #$\r$\n'
@@ -639,51 +638,19 @@
FileWrite $0 'rem #$\r$\n'
FileWrite $0 'rem #########################################################################$\r$\n'
FileWrite $0 '$\r$\n'
- FileWrite $0 'rem *******Environment variables***********$\r$\n'
- FileWrite $0 '$\r$\n'
FileWrite $0 'rem Set GRASS Installation Directory Variable$\r$\n'
- FileWrite $0 'set GRASSDIR=$INSTALL_DIR$\r$\n'
+ FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Directory where your .grassrc6 file will be stored$\r$\n'
- FileWrite $0 'set HOME=%USERPROFILE%$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Name of the wish (Tk) executable$\r$\n'
- FileWrite $0 'set GRASS_WISH=wish.exe$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Path to the shell command$\r$\n'
- FileWrite $0 'set GRASS_SH=%GRASSDIR%\msys\bin\sh.exe$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Set Path to utilities (libraries and bynaries) used by GRASS$\r$\n'
- FileWrite $0 'set PATH=%GRASSDIR%\msys\bin;%PATH%$\r$\n'
- FileWrite $0 'set PATH=%GRASSDIR%\extrabin;%GRASSDIR%\extralib;%PATH%$\r$\n'
- FileWrite $0 'set PATH=%GRASSDIR%\tcl-tk\bin;%GRASSDIR%\sqlite\bin;%GRASSDIR%\gpsbabel;%PATH%$\r$\n'
${If} $R_HKLM_INSTALL_PATH != ""
FileWrite $0 'set PATH=$R_HKLM_INSTALL_PATH\bin;%PATH%$\r$\n'
+ FileWrite $0 '$\r$\n'
${EndIf}
${If} $R_HKCU_INSTALL_PATH != ""
FileWrite $0 'set PATH=$R_HKCU_INSTALL_PATH\bin;%PATH%$\r$\n'
+ FileWrite $0 '$\r$\n'
${EndIf}
+ FileWrite $0 'call "%GISBASE%\etc\env.bat"$\r$\n'
FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Set Path to default web browser$\r$\n'
- FileWrite $0 'set GRASS_HTML_BROWSER=explorer$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Path to the proj files (notably the epsg projection list)$\r$\n'
- FileWrite $0 'set GRASS_PROJSHARE=%GRASSDIR%\proj$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Set GDAL_DATA$\r$\n'
- FileWrite $0 'set GDAL_DATA=%GRASSDIR%\share\gdal$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Set PROJ_LIB$\r$\n'
- FileWrite $0 'set PROJ_LIB=%GRASSDIR%\proj$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Set GEOTIFF_CSV$\r$\n'
- FileWrite $0 'set GEOTIFF_CSV=%GRASSDIR%\share\epsg_csv$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'rem Path to the python directory$\r$\n'
- FileWrite $0 'set PYTHONHOME=%GRASSDIR%\Python25$\r$\n'
- FileWrite $0 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python$\r$\n'
- FileWrite $0 '$\r$\n'
- FileWrite $0 'set WINGISBASE=%GRASSDIR%$\r$\n'
FileWrite $0 '"%WINGISBASE%\etc\Init.bat" %*'
FileClose $0
done_create_grass_command.bat:
@@ -949,6 +916,7 @@
Delete "$INSTDIR\REQUIREMENTS.html"
Delete "$INSTDIR\README.html"
Delete "$INSTDIR\contributors.csv"
+ Delete "$INSTDIR\contributors_extra.csv"
Delete "$INSTDIR\translators.csv"
;remove folders
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat 2011-03-07 17:39:00 UTC (rev 45597)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat 2011-03-07 17:44:44 UTC (rev 45598)
@@ -216,8 +216,17 @@
copy %SVN_PATH%\svn.exe %PACKAGE_DIR%\extrabin
copy %SVN_PATH%\*.dll %PACKAGE_DIR%\extralib
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
+ at echo Copy env.bat
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo.
+
+copy env.bat %PACKAGE_DIR%\etc
+
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
@echo Packaging Completed
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
Copied: grass/branches/releasebranch_6_4/mswindows/env.bat (from rev 45596, grass/branches/develbranch_6/mswindows/env.bat)
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/env.bat (rev 0)
+++ grass/branches/releasebranch_6_4/mswindows/env.bat 2011-03-07 17:44:44 UTC (rev 45598)
@@ -0,0 +1,34 @@
+set WINGISBASE=%GISBASE%
+
+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 bynaries) 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%
+
+rem Set Path to default web browser
+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 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
More information about the grass-commit
mailing list