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

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-12-30 14:49:01 -0800 (Sun, 30 Dec 2018)
New Revision: 73893

Modified:
   grass/trunk/mswindows/GRASS-Packager.bat.tmpl
   grass/trunk/mswindows/env.bat
   grass/trunk/mswindows/osgeo4w/env.bat.tmpl
   grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
Log:
set python 3 environment in OSGeo4W
bundle python3 for standalone winGRASS
python 3 environment in standalone winGRASS
patches provided by hellik, see #3719


Modified: grass/trunk/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat.tmpl	2018-12-30 15:46:21 UTC (rev 73892)
+++ grass/trunk/mswindows/GRASS-Packager.bat.tmpl	2018-12-30 22:49:01 UTC (rev 73893)
@@ -95,13 +95,13 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Python content to PACKAGE_DIR\Python27
+ at echo Copy Python content to PACKAGE_DIR\Python37
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
 
-mkdir %PACKAGE_DIR%\Python27
+mkdir %PACKAGE_DIR%\Python37
 
-xcopy %OSGEO4W_PKG_DIR%\apps\Python27\* %PACKAGE_DIR%\Python27 /S/V/F/I
+xcopy %OSGEO4W_PKG_DIR%\apps\Python37\* %PACKAGE_DIR%\Python37 /S/V/F/I
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------

Modified: grass/trunk/mswindows/env.bat
===================================================================
--- grass/trunk/mswindows/env.bat	2018-12-30 15:46:21 UTC (rev 73892)
+++ grass/trunk/mswindows/env.bat	2018-12-30 22:49:01 UTC (rev 73893)
@@ -2,8 +2,8 @@
 REM Environmental variables for GRASS stand-alone installer
 REM
 
-set GRASS_PYTHON=%GISBASE%\extrabin\python.exe
-set PYTHONHOME=%GISBASE%\Python27
+set GRASS_PYTHON=%GISBASE%\extrabin\python3.exe
+set PYTHONHOME=%GISBASE%\Python37
 
 set GRASS_PROJSHARE=%GISBASE%\share\proj
 

Modified: grass/trunk/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/env.bat.tmpl	2018-12-30 15:46:21 UTC (rev 73892)
+++ grass/trunk/mswindows/osgeo4w/env.bat.tmpl	2018-12-30 22:49:01 UTC (rev 73893)
@@ -8,8 +8,8 @@
 REM Note that msys package must be also installed
 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
+set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python3.exe
+set PYTHONHOME=%OSGEO4W_ROOT%\apps\Python37
 
 set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj
 

Modified: grass/trunk/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2018-12-30 15:46:21 UTC (rev 73892)
+++ grass/trunk/mswindows/osgeo4w/grass.bat.tmpl	2018-12-30 22:49:01 UTC (rev 73893)
@@ -11,6 +11,7 @@
 rem Set environmental variables
 rem
 call %OSGEO4W_ROOT%\bin\o4w_env.bat
+call %OSGEO4W_ROOT%\bin\py3_env.bat
 call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
 
 rem