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 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.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\Microsoft\jdk-11.0.12.7-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;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 (x86)\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\7-Zip;C:\Users\szeke\AppData\Local\Microsoft\WindowsApps;C:\Users\szeke\.dotnet\tools;C:\Program Files\Azure Data Studio\bin;C:\Users\szeke\AppData\Roaming\npm;E:\MSVSCode\bin;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 f686abf8e update security policy to mention 8.0 release (#6615)
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 f686abf8e..2fcc5b6c6
Fast-forward
.travis.yml | 2 +-
mapdebug.c | 20 +++++++++-----------
maperror.c | 14 ++++++++++++++
maperror.h | 1 +
mapfile.c | 2 +-
mapogcapi.cpp | 3 ++-
mappostgis.cpp | 14 +-------------
mapserv-config.cpp | 2 +-
msautotest/config/expected/missing_conf.txt | 2 +-
9 files changed, 31 insertions(+), 29 deletions(-)
git reset --hard HEAD
HEAD is now at 2fcc5b6c6 Revert "Allow configObj to be set in msLoadMapFromString"
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
2fcc5b6c690b532be512738690625f68bdb9e7cf 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 106402acaf Merge pull request #6388 from rouault/fix_cppcheck_2_10
git fetch
git checkout master
Your branch is behind 'origin/master' by 60 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin master
Updating 106402acaf..dc0012850f
Fast-forward
.github/workflows/android_cmake/start.sh | 2 +-
.github/workflows/cmake_builds.yml | 10 +-
alg/gdalchecksum.cpp | 72 +++-
alg/gdalgeoloc.cpp | 221 ++++++++---
alg/gdalgeoloc_dataset_accessor.h | 5 +-
autotest/cpp/CMakeLists.txt | 3 +
autotest/cpp/test_cpl.cpp | 103 ++++-
autotest/gcore/data/gtiff/jxl-rgbi.tif | Bin 0 -> 458 bytes
autotest/gcore/tiff_read.py | 42 +-
autotest/gcore/tiff_write.py | 151 +++++++
autotest/gcore/vrt_read.py | 44 ++-
autotest/gdrivers/aigrid.py | 4 +-
autotest/gdrivers/bsb.py | 4 +-
.../data/netcdf/missing_value_text_non_numeric.nc | Bin 0 -> 144 bytes
.../data/netcdf/missing_value_text_numeric.nc | Bin 0 -> 136 bytes
.../missing_value_text_numeric_not_in_range.nc | Bin 0 -> 136 bytes
.../{ => netcdf}/test_not_report_unrelated_dim.nc | Bin
autotest/gdrivers/doq1.py | 2 +-
autotest/gdrivers/jp2openjpeg.py | 2 +-
autotest/gdrivers/jpeg.py | 4 +-
autotest/gdrivers/mrf.py | 2 +-
autotest/gdrivers/netcdf.py | 20 +-
autotest/gdrivers/netcdf_multidim.py | 167 ++++++++
autotest/gdrivers/nitf.py | 40 +-
autotest/gdrivers/sar_ceos.py | 4 +-
autotest/gdrivers/usgsdem.py | 2 +-
autotest/gdrivers/vrtderived.py | 44 +--
.../ogr/data/gml/feature_with_gml_description.gml | 21 +
.../ogr/data/gml/feature_with_gml_description.xsd | 43 ++
.../gml/multiple_geometry_fields_srs_detection.gml | 21 +
.../gml/multiple_geometry_fields_srs_detection.xsd | 50 +++
.../test_gml_schema_not_in_ogc_schema_location.gml | 8 +
.../test_gml_schema_not_in_ogc_schema_location.xsd | 40 ++
.../gml/3.2.1/gml.xsd | 8 +
.../gml/3.2.1/other.xsd | 13 +
autotest/ogr/ogr_gml_read.py | 53 +++
autotest/ogr/ogr_gmlas.py | 16 +
autotest/ogr/ogr_gpkg.py | 64 +++
autotest/ogr/ogr_ods.py | 13 +
autotest/ogr/ogr_xlsx.py | 26 ++
cmake/helpers/GdalDriverHelper.cmake | 4 +
doc/source/drivers/raster/netcdf.rst | 6 +
doc/source/drivers/raster/vrt.rst | 8 +
doc/source/drivers/vector/csv.rst | 2 +
doc/source/drivers/vector/gpkg.rst | 43 +-
doc/source/programs/gdal2tiles.rst | 7 +-
doc/source/programs/gdal_calc.rst | 16 +-
doc/source/sponsors/index.rst | 4 +
docker/README.md | 10 +-
docker/util.sh | 16 +-
frmts/gtiff/CMakeLists.txt | 4 +
frmts/gtiff/geotiff.cpp | 56 ++-
frmts/gtiff/libtiff/dump_symbols.sh | 14 +-
frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h | 17 +-
frmts/gtiff/tif_jxl.c | 314 ++++++++++++---
frmts/netcdf/netcdfdataset.cpp | 36 +-
frmts/netcdf/netcdfdataset.h | 7 +
frmts/netcdf/netcdfmultidim.cpp | 117 +++++-
frmts/nitf/nitffile.c | 6 +-
frmts/vrt/vrtdataset.cpp | 46 +--
frmts/vrt/vrtsourcedrasterband.cpp | 432 +++++++++++++++------
frmts/zarr/zarr_array.cpp | 15 +-
gcore/gdal.h | 5 +
gcore/gdal_misc.cpp | 1 +
gcore/gdal_thread_pool.cpp | 2 +-
gcore/gdalcachedpixelaccessor.h | 22 +-
gdal.cmake | 3 +
ogr/ogrsf_frmts/csv/ogr_csv.h | 8 +-
ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 25 +-
ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp | 4 +
ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 12 +-
ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp | 31 +-
ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp | 24 ++
ogr/ogrsf_frmts/gml/gmlreader.cpp | 38 +-
ogr/ogrsf_frmts/gml/gmlreader.h | 6 +-
ogr/ogrsf_frmts/gml/ogr_gml.h | 3 +
ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp | 64 ++-
ogr/ogrsf_frmts/gmlas/ogr_gmlas.h | 21 +-
ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp | 260 ++++++++-----
ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 9 +-
ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 1 +
ogr/ogrsf_frmts/ods/ogrodsdriver.cpp | 78 +++-
ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 79 ++--
ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp | 82 +++-
port/cpl_worker_thread_pool.cpp | 113 +++++-
port/cpl_worker_thread_pool.h | 4 +-
swig/include/gdalconst.i | 3 +
swig/python/CMakeLists.txt | 60 ++-
swig/python/extensions/gdalconst_wrap.c | 1 +
.../osgeo_utils/auxiliary/gdal_argparse.py | 6 +-
swig/python/gdal-utils/osgeo_utils/gdal_calc.py | 6 +
swig/python/osgeo/gdalconst.py | 1 +
92 files changed, 2823 insertions(+), 653 deletions(-)
create mode 100644 autotest/gcore/data/gtiff/jxl-rgbi.tif
create mode 100644 autotest/gdrivers/data/netcdf/missing_value_text_non_numeric.nc
create mode 100644 autotest/gdrivers/data/netcdf/missing_value_text_numeric.nc
create mode 100644 autotest/gdrivers/data/netcdf/missing_value_text_numeric_not_in_range.nc
rename autotest/gdrivers/data/{ => netcdf}/test_not_report_unrelated_dim.nc (100%)
create mode 100644 autotest/ogr/data/gml/feature_with_gml_description.gml
create mode 100644 autotest/ogr/data/gml/feature_with_gml_description.xsd
create mode 100644 autotest/ogr/data/gml/multiple_geometry_fields_srs_detection.gml
create mode 100644 autotest/ogr/data/gml/multiple_geometry_fields_srs_detection.xsd
create mode 100644 autotest/ogr/data/gmlas/test_gml_schema_not_in_ogc_schema_location.gml
create mode 100644 autotest/ogr/data/gmlas/test_gml_schema_not_in_ogc_schema_location.xsd
create mode 100644 autotest/ogr/data/gmlas/test_gml_schema_not_in_ogc_schema_location/gml/3.2.1/gml.xsd
create mode 100644 autotest/ogr/data/gmlas/test_gml_schema_not_in_ogc_schema_location/gml/3.2.1/other.xsd
git reset --hard HEAD
HEAD is now at dc0012850f Merge pull request #6423 from rouault/vrt_flushcache_lint
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
dc0012850f96e0977d5cf1c043233f14da503fe8 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 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.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\Microsoft\jdk-11.0.12.7-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;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 (x86)\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\7-Zip;C:\Users\szeke\AppData\Local\Microsoft\WindowsApps;C:\Users\szeke\.dotnet\tools;C:\Program Files\Azure Data Studio\bin;C:\Users\szeke\AppData\Roaming\npm;E:\MSVSCode\bin;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 593314a Fix check failure caused by wrong HTTP header removal on Windows (#285)
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
593314a0a10c40cb69d9bf57cdee4826626d0c78 cd E:\buildsystem