SET PATH=E:\builds\release-1911-x64\bin;E:\builds\release-1911-x64\bin\curl;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)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.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:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;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 if exist E:\builds\release-1911-x64\bin\curl\curl.exe E:\builds\release-1911-x64\bin\curl\curl.exe -o E:\builds\release-1911-x64\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15x64\mapserver git reset --hard HEAD HEAD is now at 1ca57ae8 Allow custom override for gml_types "auto" (#6137) git pull origin Updating 1ca57ae8..5f092799 Fast-forward .github/FUNDING.yml | 6 +- .travis.yml | 3 + CMakeLists.txt | 3 - appveyor.yml | 28 +- ci/travis/before_install.sh | 33 +- cmake/FindProj.cmake | 80 +- cmake/FindPythonModule.cmake | 24 - mapogroutput.cpp | 36 +- mapscript/csharp/examples/drawmapDirect.cs | 200 +- mapscript/csharp/examples/drawmapDirectPrint.cs | 232 +- mapscript/csharp/examples/inline.cs | 270 +- mapscript/mapscript.i | 7 +- mapscript/python/CMakeLists.txt | 72 +- mapscript/python/tests/cases/layer_test.py | 12 +- mapscript/python/tests/cases/point_test.py | 8 +- mapscript/python/tests/cases/shape_test.py | 4 +- mapscript/swiginc/labelcache.i | 80 +- mapscript/swiginc/layer.i | 142 +- mapscript/swiginc/line.i | 4 +- mapscript/swiginc/map.i | 60 +- mapscript/swiginc/point.i | 4 +- mapserver.h | 70 +- mapwms.cpp | 30 +- msautotest/misc/ogr_direct.map | 58 +- msautotest/mspython/test_xmp.py | 2 +- msautotest/mssql/create_mssql_db.bat | 14 +- msautotest/mssql/expected/line.json | 8 + msautotest/mssql/expected/multiline.json | 8 + msautotest/mssql/expected/multipoint.json | 8 + msautotest/mssql/expected/multipolygon.json | 8 + .../mssql/expected/multipolygon_with_hole.json | 8 + msautotest/mssql/expected/null_line.json | 8 + msautotest/mssql/expected/null_multiline.json | 8 + msautotest/mssql/expected/null_multipoint.json | 8 + msautotest/mssql/expected/null_multipolygon.json | 8 + msautotest/mssql/expected/null_point.json | 8 + msautotest/mssql/expected/null_polygon.json | 8 + msautotest/mssql/expected/point.json | 8 + msautotest/mssql/expected/polygon.json | 8 + msautotest/mssql/expected/polygon_with_hole.json | 8 + msautotest/mssql/include/bdry_counpy2_mssql.map | 26 +- .../{cities_mssql.map => mssql_connection.map} | 10 +- .../mssql/include/wfs_ogr_export_metadata.map | 6 + msautotest/mssql/wfs_mssql.map | 9 +- msautotest/mssql/wfs_ogr_export.map | 163 + msautotest/requirements.txt | 1 + .../wms_filter_getmap130_repeated_layer.png | Bin 0 -> 3900 bytes ...ilter_getmap130_repeated_layer_empty_filter.png | Bin 0 -> 11963 bytes msautotest/wxs/wms_filter.map | 17 + renderers/agg/include/agg_conv_clipper.h | 598 +- renderers/agg/include/clipper.hpp | 604 +- renderers/agg/src/clipper.cpp | 6604 ++++++++++---------- tests/cities.csv | 14 +- version.rc.in | 104 +- 54 files changed, 4999 insertions(+), 4751 deletions(-) delete mode 100644 cmake/FindPythonModule.cmake create mode 100644 msautotest/mssql/expected/line.json create mode 100644 msautotest/mssql/expected/multiline.json create mode 100644 msautotest/mssql/expected/multipoint.json create mode 100644 msautotest/mssql/expected/multipolygon.json create mode 100644 msautotest/mssql/expected/multipolygon_with_hole.json create mode 100644 msautotest/mssql/expected/null_line.json create mode 100644 msautotest/mssql/expected/null_multiline.json create mode 100644 msautotest/mssql/expected/null_multipoint.json create mode 100644 msautotest/mssql/expected/null_multipolygon.json create mode 100644 msautotest/mssql/expected/null_point.json create mode 100644 msautotest/mssql/expected/null_polygon.json create mode 100644 msautotest/mssql/expected/point.json create mode 100644 msautotest/mssql/expected/polygon.json create mode 100644 msautotest/mssql/expected/polygon_with_hole.json rename msautotest/mssql/include/{cities_mssql.map => mssql_connection.map} (90%) create mode 100644 msautotest/mssql/include/wfs_ogr_export_metadata.map create mode 100644 msautotest/mssql/wfs_ogr_export.map create mode 100644 msautotest/wxs/expected/wms_filter_getmap130_repeated_layer.png create mode 100644 msautotest/wxs/expected/wms_filter_getmap130_repeated_layer_empty_filter.png git reset --hard HEAD HEAD is now at 5f092799 Merge pull request #6145 from jmckenna/branch-crlf git log --pretty=format:%H -n 1 > E:\builds\release-1911-x64\doc\ms_revision.txt type E:\builds\release-1911-x64\doc\ms_revision.txt 5f09279998aa5220858acc7b7d7e383963786bdf cd E:\builds cd ..\sdk\vc15x64\gdal\gdal git reset --hard HEAD HEAD is now at bf57a091cd PDS4 vector: fix potential double free if RenameFileTo() fails, and add asserts to perhaps help tracking https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25535 git pull origin Updating bf57a091cd..9e21b31c4d Fast-forward autotest/gcore/tiff_write.py | 16 + autotest/gdrivers/grib.py | 9 +- autotest/gdrivers/vrtovr.py | 82 ++++- autotest/utilities/test_gdalbuildvrt_lib.py | 31 ++ gdal/alg/gdalwarpkernel.cpp | 12 +- gdal/apps/gdalbuildvrt_lib.cpp | 472 ++++++++++++++++------------ gdal/data/gdalvrt.xsd | 13 + gdal/doc/source/drivers/raster/vrt.rst | 23 +- gdal/frmts/grib/degrib/degrib/degrib1.cpp | 14 +- gdal/frmts/grib/gribdataset.cpp | 20 +- gdal/frmts/gtiff/geotiff.cpp | 16 + gdal/frmts/vrt/vrtdataset.cpp | 166 ++++++++-- gdal/frmts/vrt/vrtdataset.h | 33 +- gdal/frmts/vrt/vrtsourcedrasterband.cpp | 24 +- gdal/frmts/vrt/vrtsources.cpp | 9 +- gdal/port/cpl_aws.cpp | 2 + gdal/port/cpl_swift.cpp | 1 + gdal/port/cpl_vsil_s3.cpp | 9 +- 18 files changed, 680 insertions(+), 272 deletions(-) git reset --hard HEAD HEAD is now at 9e21b31c4d GRIB: fix retrieval of nodata value for GRIB1 products (GDAL 3.1 regression, fixes #2962) git log --pretty=format:%H -n 1 > E:\builds\release-1911-x64\doc\gdal_revision.txt type E:\builds\release-1911-x64\doc\gdal_revision.txt 9e21b31c4d43ffe6cee869c0754c39b06d9a54d9 cd E:\builds