found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.33.31629\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;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\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;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:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapserver-8-0-vc17x64 git clone -b branch-8-0 https://github.com/mapserver/mapserver.git src\mapserver-8-0-vc17x64 cd src\mapserver-8-0-vc17x64 git reset --hard HEAD HEAD is now at 49cb764a5 change HISTORY.TXT to markdown (#6836) git fetch git checkout branch-8-0 Your branch is up to date with 'origin/branch-8-0'. git pull origin branch-8-0 Already up to date. git reset --hard HEAD HEAD is now at 49cb764a5 change HISTORY.TXT to markdown (#6836) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\ms_revision.txt type E:\buildsystem\release-1930-x64\doc\ms_revision.txt 49cb764a5cd138c1d60a40e3d28d6c048852bab2 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-3-6-vc17x64 git clone -b release/3.6 https://github.com/OSGeo/gdal.git src\gdal-3-6-vc17x64 cd src\gdal-3-6-vc17x64 git reset --hard HEAD HEAD is now at 44236c3229 .pre-commit-config.yaml: bump isort to 5.12.0 to avoid issues Poetry git fetch git checkout release/3.6 Your branch is behind 'origin/release/3.6' by 8 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin release/3.6 Updating 44236c3229..2a6ea1b217 Fast-forward apps/gdal_grid_lib.cpp | 14 +- autotest/gcore/hfa_srs.py | 197 ++++++++++++++++----- .../data/hfa/esri_54049_pe_string_only_broken.img | Bin 0 -> 10553 bytes autotest/ogr/data/mitab/proj_35.mif | 28 +-- autotest/ogr/ogr_mitab.py | 10 +- autotest/ogr/ogr_openfilegdb_write.py | 17 ++ autotest/utilities/test_gdal_grid_lib.py | 99 +++++++++++ frmts/hfa/hfadataset.cpp | 118 ++++++++++-- frmts/hfa/hfaopen.cpp | 27 +-- frmts/nitf/nitffile.c | 2 +- ogr/ogr_fromepsg.cpp | 3 +- ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp | 2 +- ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp | 18 ++ .../openfilegdb/ogropenfilegdbdriver.cpp | 34 ++++ ogr/ogrspatialreference.cpp | 8 + 15 files changed, 487 insertions(+), 90 deletions(-) create mode 100644 autotest/gdrivers/data/hfa/esri_54049_pe_string_only_broken.img git reset --hard HEAD HEAD is now at 2a6ea1b217 gdal_rasterize: ignore features whose Z attribute is null/unset (fixes #7241) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\gdal_revision.txt type E:\buildsystem\release-1930-x64\doc\gdal_revision.txt 2a6ea1b2174369453d61d238ccf5d07cbe3bfb10 cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.33.31629\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;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\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;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:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapcache-branch-1-12-vc17x64 git clone -b branch-1-12 https://github.com/MapServer/mapcache.git src\mapcache-branch-1-12-vc17x64 cd src\mapcache-branch-1-12-vc17x64 git reset --hard HEAD HEAD is now at e74b2ce Merge pull request #297 from rouault/backport_1_12_set_error_misuses git fetch git checkout branch-1-12 Your branch is up to date with 'origin/branch-1-12'. git pull origin branch-1-12 Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt e74b2ceefdace30ee9c20c8fe19885fda407f205 cd E:\buildsystem