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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-05 13:20:38 -0400 (Mon, 05 Apr 2010)
New Revision: 41734

Modified:
   grass/trunk/lib/init/grass.py
   grass/trunk/mswindows/GRASS-Installer.nsi
Log:
use GISBASE if defined


Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2010-04-05 16:05:29 UTC (rev 41733)
+++ grass/trunk/lib/init/grass.py	2010-04-05 17:20:38 UTC (rev 41734)
@@ -31,7 +31,10 @@
 
 # Variables substituted during build process
 # Set the GISBASE variable
-gisbase = "@GISBASE@"
+if os.getenv("GISBASE"):
+    gisbase = os.getenv("GISBASE")
+else:
+    gisbase = "@GISBASE@"
 cmd_name = "@START_UP@"
 grass_version = "@GRASS_VERSION_NUMBER@"
 ld_library_path_var = '@LD_LIBRARY_PATH_VAR@'

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2010-04-05 16:05:29 UTC (rev 41733)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2010-04-05 17:20:38 UTC (rev 41734)
@@ -610,7 +610,7 @@
 	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 .grass7/rc file will be stored$\r$\n'
 	FileWrite $0 'set HOME=%USERPROFILE%$\r$\n'
@@ -619,24 +619,24 @@
 	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 'set GRASS_SH=%GISBASE%\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'
+	FileWrite $0 'set PATH=%GISBASE%\msys\bin;%PATH%$\r$\n'
+	FileWrite $0 'set PATH=%GISBASE%\extrabin;%GISBASE%\extralib;%PATH%$\r$\n'
+	FileWrite $0 'set PATH=%GISBASE%\tcl-tk\bin;%GISBASE%\sqlite\bin;%GISBASE%\gpsbabel;%PATH%$\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 'set GRASS_PROJSHARE=%GISBASE%\proj$\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 'set PYTHONHOME=%GISBASE%\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 'set WINGISBASE=%GISBASE%$\r$\n'
 	FileWrite $0 '%GRASS_PYTHON% "%WINGISBASE%\grass70.py" %*'
 	FileClose $0
 	done_create_grass_command.bat: