found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\bin\HostX86\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x86;C:\Program Files (x86)\Windows Kits\10\bin\\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\ActiveTcl\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapserver-vc17 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc17 cd src\mapserver-vc17 git reset --hard HEAD HEAD is now at 257c646a7 Merge pull request #6895 from geographika/style-size-expressions git fetch git checkout main Your branch is behind 'origin/main' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 257c646a7..ceba66213 Fast-forward mapfile.c | 2 + mapogroutput.cpp | 4 +- mapscript/python/tests/cases/label_test.py | 11 +++++ mapscript/swiginc/label.i | 51 ++++++++++++++++++++-- mapscript/swiginc/map.i | 12 ++--- mapscript/swiginc/style.i | 4 +- msautotest/wxs/expected/wfs2_query_cache.json | 19 ++++++++ .../wfs2_query_cache_no_default_extent.json | 19 ++++++++ msautotest/wxs/expected/wfs_query_cache.json | 6 +-- msautotest/wxs/wfs_query_cache.map | 22 ++++++++++ 10 files changed, 135 insertions(+), 15 deletions(-) create mode 100644 msautotest/wxs/expected/wfs2_query_cache.json create mode 100644 msautotest/wxs/expected/wfs2_query_cache_no_default_extent.json git reset --hard HEAD HEAD is now at ceba66213 Apply const qualifiers in Mapscript for strings (#6908) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930\doc\ms_revision.txt type E:\buildsystem\release-1930\doc\ms_revision.txt ceba66213e53695872f4ae4dbf1c8ca50a417feb cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc17 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc17 cd src\gdal-vc17 git reset --hard HEAD HEAD is now at b8d6c4ff52 Merge pull request #7965 from dbaston/python-invalidate-band-refs git fetch git checkout master Your branch is behind 'origin/master' by 12 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating b8d6c4ff52..ecefae5921 Fast-forward autotest/cpp/CMakeLists.txt | 1 + autotest/cpp/test_ogr_organize_polygons.cpp | 270 ++++++++++++++++++++++++++++ autotest/gcore/vsicurl_streaming.py | 2 + autotest/ogr/data/testograpispy.py | 2 +- autotest/ogr/ogr_basic_test.py | 23 +++ frmts/gtiff/CMakeLists.txt | 4 + frmts/gtiff/tif_jxl.c | 6 +- frmts/jpegxl/CMakeLists.txt | 13 ++ frmts/jpegxl/jpegxl.cpp | 23 ++- frmts/ogcapi/CMakeLists.txt | 3 + frmts/ogcapi/gdalogcapidataset.cpp | 8 +- gdal.cmake | 1 + ogr/ogrgeometryfactory.cpp | 192 +++++++++++--------- swig/include/ogr.i | 6 +- 14 files changed, 455 insertions(+), 99 deletions(-) create mode 100644 autotest/cpp/test_ogr_organize_polygons.cpp git reset --hard HEAD HEAD is now at ecefae5921 Merge pull request #7912 from dbaston/organize-polygons-test git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930\doc\gdal_revision.txt type E:\buildsystem\release-1930\doc\gdal_revision.txt ecefae592141bf7734d9457d16dbb713efa09c7a cd E:\buildsystem set PATH=E:\buildsystem\release-1930\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\bin\HostX86\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x86;C:\Program Files (x86)\Windows Kits\10\bin\\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\ActiveTcl\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapcache-vc17 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc17 cd src\mapcache-vc17 git reset --hard HEAD HEAD is now at 0cb6c00 change Migration Guide to markdown (#305) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930\doc\mapcache_revision.txt type E:\buildsystem\release-1930\doc\mapcache_revision.txt 0cb6c00d19708cab7fbb1719eac62a738aa5405d cd E:\buildsystem