[GRASS-SVN] r57607 - in grass/trunk/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-09-06 10:04:08 -0700 (Fri, 06 Sep 2013)
New Revision: 57607

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
   grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
   grass/trunk/mswindows/osgeo4w/grass.tmpl
Log:
wingrass: pause on error (bat file)
          add header to osgeo4w init files


Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2013-09-06 16:48:17 UTC (rev 57606)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2013-09-06 17:04:08 UTC (rev 57607)
@@ -682,7 +682,7 @@
 	FileWrite $0 'rem #$\r$\n'
 	FileWrite $0 'rem #########################################################################$\r$\n'
 	FileWrite $0 'rem #$\r$\n'
-	FileWrite $0 'rem # GRASS Initialization$\r$\n'
+	FileWrite $0 'rem # GRASS initialization bat script$\r$\n'
 	FileWrite $0 'rem #$\r$\n'
 	FileWrite $0 'rem #########################################################################$\r$\n'
 	FileWrite $0 '$\r$\n'
@@ -701,6 +701,8 @@
 	FileWrite $0 'cd "%USERPROFILE%"'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '"%GRASS_PYTHON%" "%GISBASE%\etc\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" %*'
+	FileWrite $0 '$\r$\n$\r$\n'
+	FileWrite $0 'if %ERRORLEVEL% GEQ 1 pause'
 	FileClose $0
 	done_create_grass_command.bat:
 	

Modified: grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2013-09-06 16:48:17 UTC (rev 57606)
+++ grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2013-09-06 17:04:08 UTC (rev 57607)
@@ -1,5 +1,24 @@
 @echo off
+rem #########################################################################
+rem #
+rem # GRASS initialization bat script (OSGeo4W)
+rem #
+rem #########################################################################
+
 SET OSGEO4W_ROOT=@osgeo4w@
+
+rem
+rem Set environmental variables
+rem
 call %OSGEO4W_ROOT%\bin\o4w_env.bat
 call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
+
+rem
+rem Launch GRASS GIS
+rem
 "%GRASS_PYTHON%" "%GISBASE%\etc\grass at POSTFIX@.py" %*
+
+rem
+rem Pause on error
+rem
+if %ERRORLEVEL% GEQ 1 pause

Modified: grass/trunk/mswindows/osgeo4w/grass.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.tmpl	2013-09-06 16:48:17 UTC (rev 57606)
+++ grass/trunk/mswindows/osgeo4w/grass.tmpl	2013-09-06 17:04:08 UTC (rev 57607)
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+#########################################################################
+#
+# GRASS initialization shell script (OSGeo4W)
+#
+#########################################################################
+
 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"