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 ceba66213 Apply const qualifiers in Mapscript for strings (#6908)
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 ceba66213 Apply const qualifiers in Mapscript for strings (#6908)
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
ceba66213e53695872f4ae4dbf1c8ca50a417feb 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 ecefae5921 Merge pull request #7912 from dbaston/organize-polygons-test
git fetch
git checkout master
Your branch is behind 'origin/master' by 21 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin master
Updating ecefae5921..360a9aea02
Fast-forward
autotest/gcore/tiff_read.py | 17 ++-
autotest/gcore/tiff_srs.py | 56 ++++++++
autotest/gdrivers/arg.py | 6 +
.../filegdb/empty_polygon.gdb/a00000001.gdbtable | Bin 0 -> 362 bytes
.../filegdb/empty_polygon.gdb/a00000001.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000002.gdbtable | Bin 0 -> 2093 bytes
.../filegdb/empty_polygon.gdb/a00000002.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000003.gdbtable | Bin 0 -> 796 bytes
.../filegdb/empty_polygon.gdb/a00000003.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000004.gdbtable | Bin 0 -> 4503 bytes
.../filegdb/empty_polygon.gdb/a00000004.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000005.gdbtable | Bin 0 -> 1743 bytes
.../filegdb/empty_polygon.gdb/a00000005.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000006.gdbtable | Bin 0 -> 301 bytes
.../filegdb/empty_polygon.gdb/a00000006.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000007.gdbtable | Bin 0 -> 2301 bytes
.../filegdb/empty_polygon.gdb/a00000007.gdbtablx | Bin 0 -> 4128 bytes
.../filegdb/empty_polygon.gdb/a00000009.gdbindexes | Bin 0 -> 116 bytes
.../filegdb/empty_polygon.gdb/a00000009.gdbtable | Bin 0 -> 583 bytes
.../filegdb/empty_polygon.gdb/a00000009.gdbtablx | Bin 0 -> 5152 bytes
autotest/ogr/data/filegdb/empty_polygon.gdb/gdb | Bin 0 -> 8 bytes
.../ogr/data/filegdb/empty_polygon.gdb/timestamps | 1 +
autotest/ogr/ogr_fgdb.py | 13 ++
autotest/ogr/ogr_geom.py | 32 +++++
autotest/ogr/ogr_gml_read.py | 27 +++-
autotest/ogr/ogr_openfilegdb_write.py | 46 ++++++
cmake/modules/3.12/FindEXPAT.cmake | 85 -----------
cmake/modules/GdalFindModulePath.cmake | 2 +-
cmake/modules/{3.14 => packages}/FindCURL.cmake | 82 +++++++++--
cmake/modules/packages/FindEXPAT.cmake | 156 +++++++++++++++++++++
doc/source/development/building_from_source.rst | 15 +-
doc/source/drivers/raster/arg.rst | 10 ++
doc/source/drivers/vector/gml.rst | 8 ++
frmts/arg/argdataset.cpp | 6 +
frmts/gtiff/gt_wkt_srs.cpp | 15 ++
frmts/gtiff/gtiffdataset_read.cpp | 35 +++--
gcore/gdal_priv.h | 2 +-
gcore/gdaldrivermanager.cpp | 6 +-
ogr/ogrgeometryfactory.cpp | 60 +++++---
ogr/ogrpgeogeometry.cpp | 4 +
ogr/ogrsf_frmts/gml/gmlhandler.cpp | 8 +-
ogr/ogrsf_frmts/gml/gmlreaderp.h | 11 ++
ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp | 9 +-
ogr/ogrsf_frmts/gml/ogrgmldriver.cpp | 3 +
ogr/ogrsf_frmts/openfilegdb/filegdbindex_write.cpp | 2 +-
ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp | 27 ++--
ogr/ogrsf_frmts/openfilegdb/filegdbtable_write.cpp | 64 +++++----
.../openfilegdb/ogropenfilegdblayer_write.cpp | 6 +-
ogr/ogrsf_frmts/shape/dump_symbols.sh | 22 ++-
.../shape/gdal_shapelib_symbol_rename.h | 8 +-
ogr/ogrsf_frmts/shape/shp_vsi.h | 1 +
swig/include/python/osr_python.i | 13 +-
swig/python/modify_cpp_files.cmake | 18 ++-
53 files changed, 681 insertions(+), 195 deletions(-)
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000001.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000001.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000002.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000002.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000003.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000003.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000004.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000004.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000005.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000005.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000006.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000006.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000007.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000007.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000009.gdbindexes
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000009.gdbtable
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/a00000009.gdbtablx
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/gdb
create mode 100644 autotest/ogr/data/filegdb/empty_polygon.gdb/timestamps
delete mode 100644 cmake/modules/3.12/FindEXPAT.cmake
rename cmake/modules/{3.14 => packages}/FindCURL.cmake (74%)
create mode 100644 cmake/modules/packages/FindEXPAT.cmake
git reset --hard HEAD
HEAD is now at 360a9aea02 Merge pull request #7983 from rouault/fix_7982
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
360a9aea02dad4865471cf98f177d45437f6cd22 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 0cb6c00 change Migration Guide to markdown (#305)
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
0cb6c00d19708cab7fbb1719eac62a738aa5405d cd E:\buildsystem