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)\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\;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\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:\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 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 848cf0c7b test_bug_check.py: fix wrong variable name git fetch git checkout main Your branch is behind 'origin/main' by 6 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 848cf0c7b..411021290 Fast-forward appveyor.yml | 1 + ci/travis/before_install.sh | 3 + ci/travis/script.sh | 3 + mapgml.c | 24 +++++-- mapogcfilter.cpp | 2 +- mapogr.cpp | 69 ++++++++++++++++++++- mapserver.h | 2 +- msautotest/wxs/data/test_6446.gpkg | Bin 0 -> 98304 bytes msautotest/wxs/data/withnullvalues.csv | 6 +- msautotest/wxs/data/withnullvalues.csvt | 2 +- .../wxs/expected/wfs_ogr_gpkg_propertyisnull.xml | 35 +++++++++++ msautotest/wxs/expected/wfsogr10_datetime.xml | 58 +++++++++++++++++ msautotest/wxs/expected/wfsogr10_nullnumeric.csv | 3 + msautotest/wxs/expected/wfsogr10_nullnumeric.xml | 6 -- msautotest/wxs/wfs_ogr.map | 7 ++- msautotest/wxs/wfs_ogr_gpkg.map | 21 +++++++ 16 files changed, 221 insertions(+), 21 deletions(-) create mode 100644 msautotest/wxs/data/test_6446.gpkg create mode 100644 msautotest/wxs/expected/wfs_ogr_gpkg_propertyisnull.xml create mode 100644 msautotest/wxs/expected/wfsogr10_datetime.xml create mode 100644 msautotest/wxs/expected/wfsogr10_nullnumeric.csv delete mode 100644 msautotest/wxs/expected/wfsogr10_nullnumeric.xml git reset --hard HEAD HEAD is now at 411021290 WFS: supports PropertyIsNULL on GeoPackage (#6446) 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 411021290cd3bf175daefc6b8f19cad46cdb0310 cd E:\buildsystem 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 8b45d48d5e fuzzers/gdal_fuzzer.cpp: avoid int64 overflow. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=42251 git fetch git checkout master Your branch is behind 'origin/master' by 47 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 8b45d48d5e..d49e9cd1fb Fast-forward .github/workflows/cmake_builds.yml | 16 +- alg/gdaltransformer.cpp | 3 + autotest/cpp/CMakeLists.txt | 29 +- .../data/jpeg2000/uint32_2x2_lossless_nbits_20.j2k | Bin 0 -> 96 bytes autotest/gdrivers/data/vrt/bug4997.vrt | 58 +++ .../gdrivers/data/vrt/bug4997_intermediary.vrt | 61 +++ autotest/gdrivers/ecw.py | 17 +- autotest/gdrivers/jp2kak.py | 78 +++- autotest/gdrivers/vrtwarp.py | 14 + autotest/ogr/ogr_gmt.py | 15 + autotest/ogr/ogr_mssqlspatial.py | 173 +++++++- autotest/pyscripts/test_gdal_polygonize.py | 18 + autotest/pyscripts/test_gdalinfo_py.py | 32 +- autotest/requirements.txt | 2 +- autotest/utilities/test_gdalinfo.py | 35 +- autotest/utilities/test_gdalwarp_lib.py | 19 + ci/travis/conda/compile.sh | 2 +- cmake/helpers/CheckDependentLibraries.cmake | 50 ++- cmake/helpers/GdalDriverHelper.cmake | 4 +- cmake/helpers/GdalSetTestEnv.cmake | 30 ++ cmake/modules/3.12/FindJPEG.cmake | 1 + cmake/modules/DefineFindPackage2.cmake | 64 ++- cmake/modules/packages/FindCFITSIO.cmake | 43 -- cmake/modules/packages/FindECW.cmake | 5 +- cmake/modules/packages/FindFYBA.cmake | 38 ++ cmake/modules/packages/FindGTA.cmake | 41 -- cmake/modules/packages/FindIDB.cmake | 45 +++ cmake/modules/packages/FindJXL.cmake | 48 --- cmake/modules/packages/FindKEA.cmake | 36 -- cmake/modules/packages/FindMONGOCXX.cmake | 56 +++ cmake/modules/packages/FindNetCDF.cmake | 3 + cmake/modules/packages/FindODBC.cmake | 1 + cmake/modules/packages/FindOGDI.cmake | 4 +- cmake/modules/packages/FindOpenEXR.cmake | 16 +- cmake/modules/packages/FindOracle.cmake | 3 + cmake/modules/packages/FindPDFium.cmake | 66 ---- cmake/modules/packages/FindPodofo.cmake | 4 +- ...FindRasterlite2.cmake => FindRASTERLITE2.cmake} | 83 ++-- cmake/modules/packages/FindSFCGAL.cmake | 2 + cmake/modules/packages/FindSOSI.cmake | 38 -- cmake/modules/packages/FindSPATIALITE.cmake | 5 +- cmake/modules/packages/FindTEIGHA.cmake | 1 + doc/source/build_hints.rst | 289 +++++++++++++- doc/source/drivers/raster/jp2kak.rst | 2 +- doc/source/drivers/vector/gmt.rst | 3 + frmts/CMakeLists.txt | 4 +- frmts/ecw/ecwdataset.cpp | 66 ++++ frmts/fits/CMakeLists.txt | 3 +- frmts/gtiff/libtiff/tif_ojpeg.c | 18 + frmts/heif/CMakeLists.txt | 3 +- frmts/jp2kak/jp2kakdataset.cpp | 245 +++++++++--- frmts/mrsid/CMakeLists.txt | 6 + frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp | 6 + frmts/vrt/vrtwarped.cpp | 28 +- gdal.cmake | 5 +- ogr/ogrsf_frmts/CMakeLists.txt | 4 +- ogr/ogrsf_frmts/gmt/ogr_gmt.h | 14 +- ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp | 46 ++- ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp | 3 +- ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp | 341 ++++++++-------- ogr/ogrsf_frmts/idb/CMakeLists.txt | 14 +- ogr/ogrsf_frmts/mongodbv3/CMakeLists.txt | 9 +- .../mssqlspatial/ogrmssqlspatiallayer.cpp | 17 +- .../mssqlspatial/ogrmssqlspatialtablelayer.cpp | 8 +- ogr/ogrsf_frmts/sosi/CMakeLists.txt | 16 +- ogr/ogrsf_frmts/sqlite/CMakeLists.txt | 1 - swig/CMakeLists.txt | 25 +- swig/csharp/CMakeLists.txt | 440 ++++++++++++--------- swig/csharp/build_dll.cmake | 20 + swig/java/CMakeLists.txt | 183 ++++++++- swig/java/add_javadoc.c | 35 +- swig/java/build.xml | 41 +- swig/java/build_java_doc.cmake | 41 ++ swig/python/CMakeLists.txt | 15 +- .../gdal-utils/osgeo_utils/gdal_polygonize.py | 16 +- 75 files changed, 2277 insertions(+), 949 deletions(-) create mode 100644 autotest/gdrivers/data/jpeg2000/uint32_2x2_lossless_nbits_20.j2k create mode 100644 autotest/gdrivers/data/vrt/bug4997.vrt create mode 100644 autotest/gdrivers/data/vrt/bug4997_intermediary.vrt create mode 100644 cmake/helpers/GdalSetTestEnv.cmake delete mode 100644 cmake/modules/packages/FindCFITSIO.cmake create mode 100644 cmake/modules/packages/FindFYBA.cmake delete mode 100644 cmake/modules/packages/FindGTA.cmake create mode 100644 cmake/modules/packages/FindIDB.cmake delete mode 100644 cmake/modules/packages/FindJXL.cmake delete mode 100644 cmake/modules/packages/FindKEA.cmake create mode 100644 cmake/modules/packages/FindMONGOCXX.cmake delete mode 100644 cmake/modules/packages/FindPDFium.cmake rename cmake/modules/packages/{FindRasterlite2.cmake => FindRASTERLITE2.cmake} (51%) delete mode 100644 cmake/modules/packages/FindSOSI.cmake create mode 100644 swig/csharp/build_dll.cmake create mode 100644 swig/java/build_java_doc.cmake git reset --hard HEAD HEAD is now at d49e9cd1fb Merge pull request #4998 from rouault/kakadu_int32 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 d49e9cd1fbbff66599d6d0dedb6bc1d8f608c58f 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)\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\;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\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:\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 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 11f7713 Merge pull request #265 from geographika/content-headers 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 11f7713c5efb730a1699dfd35bbf7300b38c8e06 cd E:\buildsystem