found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;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 (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja git config --global core.autocrlf false if not exist src\mapserver-vc15x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc15x64 cd src\mapserver-vc15x64 git reset --hard HEAD HEAD is now at a8f6acad8 Fix opacity calculation problem with the agg renderer (#5697) (#7085) git fetch git checkout main Your branch is behind 'origin/main' by 7 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating a8f6acad8..6a89a377b Fast-forward CMakeLists.txt | 31 +++++++++++++++++---- ci/build.sh | 14 ++++++++-- ci/setup.sh | 1 + cmake/FindPCRE2.cmake | 25 +++++++++++++++++ fuzzers/CMakeLists.txt | 4 +-- msautotest/README | 6 ++++ .../expected/ms_map_pattern_conf_bad_regex.txt | 2 +- .../ms_map_pattern_conf_bad_regex.txt.alternative | 8 ++++++ src/mapfile.c | 18 ++++++++---- src/mapproject.c | 32 ++++++++++++++++++++-- src/mapregex.c | 5 ++++ src/mapscript/csharp/CMakeLists.txt | 1 + src/mapscript/java/CMakeLists.txt | 1 + src/mapscript/perl/CMakeLists.txt | 1 + src/mapscript/python/CMakeLists.txt | 1 + src/mapscript/ruby/CMakeLists.txt | 1 + src/mapserver-config.h.in | 1 + src/mapservutil.c | 2 +- 18 files changed, 133 insertions(+), 21 deletions(-) create mode 100644 cmake/FindPCRE2.cmake create mode 100644 msautotest/config/expected/ms_map_pattern_conf_bad_regex.txt.alternative git reset --hard HEAD HEAD is now at 6a89a377b Merge pull request #7073 from rouault/pcre2 git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\ms_revision.txt type E:\buildsystem\release-1916-x64\doc\ms_revision.txt 6a89a377bb486131b0e6f8f425bd33b340f30256 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc15x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc15x64 cd src\gdal-vc15x64 git reset --hard HEAD HEAD is now at 2a3af362b1 Merge pull request #10260 from rouault/fix_10259 git fetch git checkout master Your branch is behind 'origin/master' by 26 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 2a3af362b1..d6a7db5520 Fast-forward alg/viewshed.cpp | 291 +++++++++++++++------ alg/viewshed.h | 52 +++- apps/gdal_utils_priv.h | 1 + apps/gdalenhance.cpp | 2 + apps/ogr2ogr_bin.cpp | 3 +- apps/ogr2ogr_lib.cpp | 104 +++++++- autotest/cpp/test_viewshed.cpp | 230 +++++++++++----- autotest/gdrivers/data/isg/header_dms.isg | 28 ++ autotest/gdrivers/isg.py | 14 + autotest/ogr/ogr_libkml.py | 11 + autotest/utilities/test_gdal_viewshed.py | 2 +- autotest/utilities/test_ogr2ogr_lib.py | 74 +++++- ci/travis/s390x/before_install.sh | 5 +- doc/source/about_no_title.rst | 4 +- doc/source/development/dev_practices.rst | 49 +++- doc/source/development/testing.rst | 7 + doc/source/download.rst | 8 +- doc/source/download_past.rst | 6 + doc/source/drivers/raster/ecw.rst | 1 + doc/source/drivers/vector/mapinfo_encodings.csv | 37 +++ doc/source/drivers/vector/mitab.rst | 8 +- doc/source/programs/gdal2tiles.rst | 4 +- doc/source/programs/gdal_merge.rst | 4 + doc/source/programs/ogrinfo.rst | 6 + doc/source/user/configoptions.rst | 1 - frmts/aaigrid/aaigriddataset.cpp | 39 ++- ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp | 2 +- ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp | 24 +- ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp | 1 + swig/include/python/gdal_python.i | 6 +- swig/python/gdal-utils/osgeo_utils/gdal2tiles.py | 11 +- .../osgeo_utils/samples/validate_gpkg.py | 26 +- 32 files changed, 840 insertions(+), 221 deletions(-) create mode 100644 autotest/gdrivers/data/isg/header_dms.isg create mode 100644 doc/source/drivers/vector/mapinfo_encodings.csv git reset --hard HEAD HEAD is now at d6a7db5520 gdalenhance: fix memleak (fixes #10323) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\gdal_revision.txt type E:\buildsystem\release-1916-x64\doc\gdal_revision.txt d6a7db55201797ebe2b2ddf6eee9207f1fa21898 cd E:\buildsystem set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;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 (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja git config --global core.autocrlf false if not exist src\mapcache-vc15x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc15x64 cd src\mapcache-vc15x64 git reset --hard HEAD HEAD is now at 339008f handle CMake deprecation warning (#342) 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-1916-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt 339008f3d010364a4c0489bb4b8f0dc68039ca79 cd E:\buildsystem