Skip to content

Commit 3ba2f8e

Browse files
committed
osgeo4w: update to grass72
1 parent 952e6fb commit 3ba2f8e

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎ms-windows/osgeo4w/package-nightly.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ set CMAKE_OPT=^
9191
-D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE
9292

9393
:cmake
94-
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass70 --config path`) do set GRASS70_PATH=%%a
95-
for %%i in ("%GRASS70_PATH%") do set GRASS70_VERSION=%%~nxi
96-
set GRASS70_VERSION=%GRASS70_VERSION:grass-=%
97-
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS70_VERSION%
94+
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass72 --config path`) do set GRASS72_PATH=%%a
95+
for %%i in ("%GRASS72_PATH%") do set GRASS72_VERSION=%%~nxi
96+
set GRASS72_VERSION=%GRASS72_VERSION:grass-=%
97+
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS72_VERSION%
9898

9999
set PYTHONPATH=
100100
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
@@ -168,7 +168,7 @@ cmake -G Ninja ^
168168
-D WITH_GRASS6=TRUE ^
169169
-D WITH_GRASS7=TRUE ^
170170
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
171-
-D GRASS_PREFIX7=%GRASS70_PATH:\=/% ^
171+
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
172172
-D WITH_GLOBE=TRUE ^
173173
-D WITH_TOUCH=TRUE ^
174174
-D WITH_ORACLE=TRUE ^

‎ms-windows/osgeo4w/package.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ set CMAKE_OPT=^
8585
-D CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS=TRUE
8686

8787
:cmake
88-
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass70 --config path`) do set GRASS70_PATH=%%a
89-
for %%i in ("%GRASS70_PATH%") do set GRASS70_VERSION=%%~nxi
90-
set GRASS70_VERSION=%GRASS70_VERSION:grass-=%
91-
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS70_VERSION%
88+
for /f "usebackq tokens=1" %%a in (`%OSGEO4W_ROOT%\bin\grass72 --config path`) do set GRASS72_PATH=%%a
89+
for %%i in ("%GRASS72_PATH%") do set GRASS72_VERSION=%%~nxi
90+
set GRASS72_VERSION=%GRASS72_VERSION:grass-=%
91+
set GRASS_VERSIONS=%GRASS6_VERSION% %GRASS72_VERSION%
9292

9393
set PYTHONPATH=
9494
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
@@ -159,7 +159,7 @@ cmake -G Ninja ^
159159
-D WITH_GRASS6=TRUE ^
160160
-D WITH_GRASS7=TRUE ^
161161
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
162-
-D GRASS_PREFIX7=%GRASS70_PATH:\=/% ^
162+
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
163163
-D WITH_GLOBE=TRUE ^
164164
-D WITH_TOUCH=TRUE ^
165165
-D WITH_ORACLE=TRUE ^

0 commit comments

Comments
 (0)