Преглед изворни кода

set python 3 environment in OSGeo4W
bundle python3 for standalone winGRASS
python 3 environment in standalone winGRASS
patches provided by hellik, see https://trac.osgeo.org/grass/ticket/3719


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73893 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa пре 6 година
родитељ
комит
1955a178e5

+ 3 - 3
mswindows/GRASS-Packager.bat.tmpl

@@ -95,13 +95,13 @@ xcopy %OSGEO4W_PKG_DIR%\share\epsg_csv %PACKAGE_DIR%\share\epsg_csv /S/V/F/I
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy Python content to PACKAGE_DIR\Python27
+@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 -----------------------------------------------------------------------------------------------------------------------

+ 2 - 2
mswindows/env.bat

@@ -2,8 +2,8 @@ REM
 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
 

+ 2 - 2
mswindows/osgeo4w/env.bat.tmpl

@@ -8,8 +8,8 @@ REM Uncomment if you want to use Bash instead of Cmd
 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
 

+ 1 - 0
mswindows/osgeo4w/grass.bat.tmpl

@@ -11,6 +11,7 @@ rem
 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-@VERSION@\etc\env.bat
 
 rem