Skip to content

Commit

Permalink
Merge branch 'main' into renovate/ubuntu-22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
nilason committed Apr 16, 2024
2 parents 928a1b8 + 11b986b commit 327cdcc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions mswindows/GRASS-Packager.bat.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ xcopy %OSGEO4W_PKG_DIR%\share\gdal %PACKAGE_DIR%\share\gdal /S/V/F/I
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.

mkdir %PACKAGE_DIR%\Python39
mkdir %PACKAGE_DIR%\Python312

xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
xcopy %OSGEO4W_PKG_DIR%\apps\Python312\* %PACKAGE_DIR%\Python312 /S/V/F/I

@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions mswindows/crosscompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,10 @@ if defined GRASS_PYTHON (
) else (
rem Change this variable to override auto-detection of python.exe in
rem PATH
set GRASS_PYTHON=C:\Python39\python.exe
set GRASS_PYTHON=C:\Python312\python.exe
rem For portable installation, use %~d0 for the changing drive letter
rem set GRASS_PYTHON=%~d0\Python39\python.exe
rem set GRASS_PYTHON=%~d0\Python312\python.exe
if not exist "%GRASS_PYTHON%" (
set GRASS_PYTHON=
Expand Down
2 changes: 1 addition & 1 deletion mswindows/env.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ REM Environmental variables for GRASS stand-alone installer
REM

set GRASS_PYTHON=%GISBASE%\extrabin\python3.exe
set PYTHONHOME=%GISBASE%\Python39
set PYTHONHOME=%GISBASE%\Python312

set GRASS_PROJSHARE=%GISBASE%\share\proj

Expand Down
2 changes: 1 addition & 1 deletion mswindows/osgeo4w/build_osgeo4w.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -e
# compile
export PATH=${OSGEO4W_ROOT_MSYS}/bin:/usr/bin:/mingw64/bin
export C_INCLUDE_PATH=".:${OSGEO4W_ROOT_MSYS}/include:${SRC}/dist.${ARCH}/include:/c/msys64/mingw64/include"
export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python312
export ARCH=x86_64-w64-mingw32

./configure \
Expand Down

0 comments on commit 327cdcc

Please sign in to comment.