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:\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 (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 2317b0c25 Correct error message function (#6935) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git reset --hard HEAD HEAD is now at 2317b0c25 Correct error message function (#6935) 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 2317b0c25a1d8472ab9c2ded476edf51e2d54be7 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 73e9cd9803 Doc: s/CMake/Homebrew/ git fetch git checkout master Your branch is behind 'origin/master' by 8 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 73e9cd9803..9c2401d0a5 Fast-forward apps/dumpoverviews.cpp | 2 +- apps/gdal_contour.cpp | 31 ++--- apps/gdal_create.cpp | 23 ++-- apps/gdal_footprint_bin.cpp | 36 +++--- apps/gdal_grid_bin.cpp | 45 +++---- apps/gdal_rasterize_bin.cpp | 41 ++++--- apps/gdal_translate_bin.cpp | 61 +++++----- apps/gdal_viewshed.cpp | 46 +++---- apps/gdaladdo.cpp | 41 ++++--- apps/gdalasyncread.cpp | 12 +- apps/gdalbuildvrt_bin.cpp | 41 ++++--- apps/gdaldem_bin.cpp | 73 ++++++----- apps/gdalenhance.cpp | 6 +- apps/gdalflattenmask.c | 8 +- apps/gdalinfo_bin.cpp | 27 +++-- apps/gdallocationinfo.cpp | 24 ++-- apps/gdalmanage.cpp | 33 +++-- apps/gdalmdiminfo_bin.cpp | 18 +-- apps/gdalmdimtranslate_bin.cpp | 34 +++--- apps/gdalsrsinfo.cpp | 57 ++++----- apps/gdaltindex.cpp | 32 ++--- apps/gdaltransform.cpp | 31 ++--- apps/gdalwarp_bin.cpp | 54 +++++---- apps/gdalwarpsimple.c | 11 +- apps/gnmanalyse.cpp | 104 ++++++++-------- apps/gnmmanage.cpp | 110 +++++++++-------- apps/nearblack_bin.cpp | 24 ++-- apps/ogr2ogr_bin.cpp | 97 ++++++++------- apps/ogrinfo_bin.cpp | 42 ++++--- apps/ogrlineref.cpp | 133 +++++++++++---------- apps/ogrtindex.cpp | 97 ++++++++------- apps/sozip.cpp | 42 +++---- autotest/gcore/vsis3.py | 38 ++++++ doc/source/programs/argument_syntax.rst | 59 +++++++++ doc/source/programs/gdal2tiles.rst | 12 +- doc/source/programs/gdal2xyz.rst | 10 +- doc/source/programs/gdal_calc.rst | 6 +- doc/source/programs/gdal_contour.rst | 9 +- doc/source/programs/gdal_create.rst | 20 ++-- doc/source/programs/gdal_edit.rst | 31 ++--- doc/source/programs/gdal_footprint.rst | 18 +-- doc/source/programs/gdal_grid.rst | 28 ++--- doc/source/programs/gdal_merge.rst | 10 +- doc/source/programs/gdal_pansharpen.rst | 29 +++-- doc/source/programs/gdal_polygonize.rst | 10 +- doc/source/programs/gdal_proximity.rst | 14 +-- doc/source/programs/gdal_rasterize.rst | 24 ++-- doc/source/programs/gdal_retile.rst | 18 +-- doc/source/programs/gdal_translate.rst | 62 +++++----- doc/source/programs/gdal_viewshed.rst | 2 +- doc/source/programs/gdaladdo.rst | 16 +-- doc/source/programs/gdalbuildvrt.rst | 42 +++---- doc/source/programs/gdaldem.rst | 45 +++---- doc/source/programs/gdalinfo.rst | 9 +- doc/source/programs/gdallocationinfo.rst | 9 +- doc/source/programs/gdalmdiminfo.rst | 8 +- doc/source/programs/gdalmdimtranslate.rst | 22 ++-- doc/source/programs/gdaltindex.rst | 10 +- doc/source/programs/gdaltransform.rst | 11 +- doc/source/programs/gdalwarp.rst | 53 ++++---- doc/source/programs/gnmanalyse.rst | 18 +-- doc/source/programs/gnmmanage.rst | 27 ++--- doc/source/programs/index.rst | 13 ++ doc/source/programs/nearblack.rst | 10 +- doc/source/programs/ogr2ogr.rst | 108 +++++++++-------- doc/source/programs/ogr_layer_algebra.rst | 24 ++-- doc/source/programs/ogrinfo.rst | 20 ++-- doc/source/programs/ogrlineref.rst | 30 ++--- doc/source/programs/ogrmerge.rst | 20 ++-- doc/source/programs/ogrtindex.rst | 11 +- doc/source/programs/options/co.rst | 2 +- doc/source/programs/sozip.rst | 16 +-- frmts/hdf5/bagdataset.cpp | 8 +- port/cpl_conv.cpp | 3 +- port/cpl_vsil.cpp | 13 +- swig/python/gdal-utils/README.rst | 4 +- swig/python/gdal-utils/osgeo_utils/gdal_edit.py | 104 +++++++++------- swig/python/gdal-utils/osgeo_utils/gdal_merge.py | 40 +++++-- .../gdal-utils/osgeo_utils/gdal_pansharpen.py | 35 +++--- .../gdal-utils/osgeo_utils/gdal_proximity.py | 28 +++-- swig/python/gdal-utils/osgeo_utils/gdal_retile.py | 90 +++++++------- .../gdal-utils/osgeo_utils/ogr_layer_algebra.py | 108 ++++++++++------- swig/python/gdal-utils/osgeo_utils/ogrmerge.py | 112 +++++++++-------- .../gdal-utils/osgeo_utils/samples/gdal_lut.py | 2 +- .../gdal-utils/osgeo_utils/samples/gdalinfo.py | 2 +- .../gdal-utils/osgeo_utils/samples/loslas2ntv2.py | 2 +- .../gdal-utils/osgeo_utils/samples/ogr2ogr.py | 2 +- .../gdal-utils/osgeo_utils/samples/ogr_dispatch.py | 2 +- 88 files changed, 1614 insertions(+), 1301 deletions(-) create mode 100644 doc/source/programs/argument_syntax.rst git reset --hard HEAD HEAD is now at 9c2401d0a5 BAG: avoid memleak in error code path of BAGResampledBand::IReadBlock() 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 9c2401d0a50961a9e49cf5be50b959a182993a43 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:\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 (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 0b85061 Add support for pcre2. (#314) 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 0b85061c673ade7a0890759105c7db79a21af87d cd E:\buildsystem