[GRASS-SVN] r67174 - in grass/branches/releasebranch_7_0/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-16 07:38:55 -0800 (Wed, 16 Dec 2015)
New Revision: 67174

Modified:
   grass/branches/releasebranch_7_0/mswindows/env.bat
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
wingrass: cleanup env.bat files, change destination for extra libs
          (merge r67173 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/env.bat	2015-12-16 15:33:48 UTC (rev 67173)
+++ grass/branches/releasebranch_7_0/mswindows/env.bat	2015-12-16 15:38:55 UTC (rev 67174)
@@ -2,10 +2,6 @@
 REM Environmental variables for GRASS stand-alone installer
 REM
 
-REM Default prompt: cmd.exe
-REM To enable bash prompt please uncomment the line below
-REM set GRASS_SH=%GISBASE%\msys\bin\sh.exe
-
 set GRASS_PYTHON=%GISBASE%\extrabin\python.exe
 set PYTHONHOME=%GISBASE%\Python27
 
@@ -15,9 +11,7 @@
 set GDAL_DATA=%GISBASE%\share\gdal
 set GEOTIFF_CSV=%GISBASE%\share\epsg_csv
 
-set PATH=%GISBASE%\msys\bin;%PATH%
-set PATH=%GISBASE%\extrabin;%PATH%
-set PATH=%GISBASE%\bin;%PATH%
+set PATH=%GISBASE%\extrabin;%GISBASE%\bin;%PATH%
 
 REM set RStudio temporarily to %PATH% if it exists
 

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl	2015-12-16 15:33:48 UTC (rev 67173)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl	2015-12-16 15:38:55 UTC (rev 67174)
@@ -3,9 +3,6 @@
 REM
 
 set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@
-REM Default prompt: cmd.exe
-REM To enable bash prompt please uncomment the line below
-REM set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
 
 set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python.exe
 set PYTHONHOME=%OSGEO4W_ROOT%\apps\Python27
@@ -16,8 +13,6 @@
 set GDAL_DATA=%OSGEO4W_ROOT%\share\gdal
 set GEOTIFF_CSV=%OSGEO4W_ROOT%\share\epsg_csv
 
-set PATH=%OSGEO4W_ROOT%\apps\msys\bin;%PATH%
-
 REM set RStudio temporarily to %PATH% if it exists
 
 IF EXIST "%ProgramFiles%\RStudio\bin\rstudio.exe" set PATH=%PATH%;%ProgramFiles%\RStudio\bin

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-16 15:33:48 UTC (rev 67173)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-16 15:38:55 UTC (rev 67174)
@@ -253,7 +253,7 @@
 	/mingw${MINGW_POSTFIX}/bin/libpng16-16.dll \
 	/mingw${MINGW_POSTFIX}/bin/libsystre-0.dll \
 	/mingw${MINGW_POSTFIX}/bin/libtre-5.dll \
-	apps/grass/grass-$VERSION/lib
+	apps/grass/grass-$VERSION/bin
     
     # creating grass package
     tar -cjf $PDIR/grass$PACKAGE_POSTFIX-$VERSION-$PACKAGE_PATCH.tar.bz2 \