Skip to content

Commit ac68140

Browse files
committed
osgeo4w: update to grass72
1 parent 057b42a commit ac68140

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ms-windows/osgeo4w/package-nightly.cmd

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

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

9898
set PYTHONPATH=
9999
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
@@ -164,7 +164,7 @@ cmake %CMAKE_OPT% ^
164164
-D WITH_GRASS6=TRUE ^
165165
-D WITH_GRASS7=TRUE ^
166166
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
167-
-D GRASS_PREFIX7=%GRASS70_PATH:\=/% ^
167+
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
168168
-D WITH_GLOBE=FALSE ^
169169
-D WITH_TOUCH=TRUE ^
170170
-D WITH_ORACLE=TRUE ^

ms-windows/osgeo4w/package.cmd

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

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

9494
set PYTHONPATH=
9595
path %PF86%\CMake\bin;%PATH%;c:\cygwin\bin
@@ -160,7 +160,7 @@ cmake %CMAKE_OPT% ^
160160
-D WITH_GRASS6=TRUE ^
161161
-D WITH_GRASS7=TRUE ^
162162
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS6_VERSION% ^
163-
-D GRASS_PREFIX7=%GRASS70_PATH:\=/% ^
163+
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
164164
-D WITH_GLOBE=FALSE ^
165165
-D WITH_TOUCH=TRUE ^
166166
-D WITH_ORACLE=TRUE ^

0 commit comments

Comments
 (0)