SET PATH=E:\builds\release-1911\bin;E:\builds\release-1911\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;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;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\;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\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\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\;E:\app\szekeres\product\11.2.0\dbhome_1\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 (x86)\Microsoft SDKs\TypeScript\1.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 exist E:\builds\release-1911\bin\curl\curl.exe E:\builds\release-1911\bin\curl\curl.exe -o E:\builds\release-1911\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15\mapserver git reset --hard HEAD HEAD is now at 9bd402c3 FindOracle.cmake: complementary fix to find OCI 19 git pull origin Already up to date. git reset --hard HEAD HEAD is now at 9bd402c3 FindOracle.cmake: complementary fix to find OCI 19 git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\ms_revision.txt type E:\builds\release-1911\doc\ms_revision.txt 9bd402c3596c252195da90a487961b12a15f34c6 cd E:\builds cd ..\sdk\vc15\gdal\gdal git reset --hard HEAD HEAD is now at 532eae1624 Merge pull request #3127 from rouault/ci_osx_conda git pull origin Updating 532eae1624..32bf61cc24 Fast-forward autotest/gcore/hfa_srs.py | 17 + autotest/gdrivers/fits.py | 3 +- autotest/gdrivers/memmultidim.py | 153 +++- autotest/gdrivers/netcdf_multidim.py | 8 +- autotest/ogr/ogr_as_sqlite_extension.py | 30 +- autotest/ogr/ogr_basic_test.py | 26 + autotest/ogr/ogr_geojson.py | 49 +- autotest/osr/osr_epsg.py | 24 + autotest/pymod/xmlvalidate.py | 24 +- gdal/alg/gdal_alg_priv.h | 3 + gdal/alg/gdaltransformer.cpp | 25 +- gdal/alg/gdalwarpoperation.cpp | 68 +- gdal/doc/source/_extensions/redirects.py | 1 + gdal/frmts/fits/fitsdataset.cpp | 91 ++- gdal/frmts/hdf4/hdf4multidim.cpp | 76 +- gdal/frmts/hfa/GNUmakefile | 2 + gdal/frmts/hfa/hfadataset.cpp | 44 +- gdal/frmts/hfa/makefile.vc | 2 + gdal/frmts/mem/memdataset.cpp | 16 +- gdal/frmts/netcdf/netcdfmultidim.cpp | 32 +- gdal/frmts/vrt/vrtdataset.h | 10 +- gdal/gcore/gdal.h | 4 + gdal/gcore/gdal_priv.h | 8 +- gdal/gcore/gdalmultidim.cpp | 674 +++++++++++++--- gdal/gcore/gdalrasterband.cpp | 8 +- gdal/ogr/ogr_fromepsg.cpp | 81 -- gdal/ogr/ogr_p.h | 3 + gdal/ogr/ogrfeature.cpp | 38 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp | 120 ++- gdal/ogr/ogrspatialreference.cpp | 112 +++ gdal/ogr/ogrutils.cpp | 63 ++ gdal/swig/include/MultiDimensional.i | 24 +- gdal/swig/python/extensions/gdal_wrap.cpp | 146 +++- gdal/swig/python/osgeo/auxiliary/__init__.py | 0 gdal/swig/python/osgeo/auxiliary/base.py | 122 +++ gdal/swig/python/osgeo/gdal.py | 22 +- gdal/swig/python/osgeo/utils/epsg_tr.py | 9 +- gdal/swig/python/osgeo/utils/esri2wkt.py | 2 +- gdal/swig/python/osgeo/utils/gcps2vec.py | 15 +- gdal/swig/python/osgeo/utils/gcps2wld.py | 8 +- gdal/swig/python/osgeo/utils/gdal2xyz.py | 15 +- gdal/swig/python/osgeo/utils/gdal_auth.py | 17 +- gdal/swig/python/osgeo/utils/gdal_calc.py | 66 +- gdal/swig/python/osgeo/utils/gdal_fillnodata.py | 21 +- gdal/swig/python/osgeo/utils/gdal_merge.py | 70 +- gdal/swig/python/osgeo/utils/gdal_pansharpen.py | 50 +- gdal/swig/python/osgeo/utils/gdal_polygonize.py | 65 +- gdal/swig/python/osgeo/utils/gdal_proximity.py | 61 +- gdal/swig/python/osgeo/utils/gdal_retile.py | 39 +- gdal/swig/python/osgeo/utils/gdal_sieve.py | 71 +- gdal/swig/python/osgeo/utils/gdalchksum.py | 11 +- gdal/swig/python/osgeo/utils/gdalcompare.py | 8 +- gdal/swig/python/osgeo/utils/gdalident.py | 15 +- gdal/swig/python/osgeo/utils/gdalimport.py | 9 +- gdal/swig/python/osgeo/utils/gdalmove.py | 18 +- gdal/swig/python/osgeo/utils/mkgraticule.py | 9 +- gdal/swig/python/osgeo/utils/ogrmerge.py | 55 +- gdal/swig/python/osgeo/utils/pct2rgb.py | 83 +- gdal/swig/python/osgeo/utils/rgb2pct.py | 86 +- gdal/swig/python/samples/README | 118 --- gdal/swig/python/samples/README.md | 165 ++++ gdal/swig/python/samples/assemblepoly.py | 137 ++-- gdal/swig/python/samples/attachpct.py | 79 +- gdal/swig/python/samples/build_jp2_from_xml.py | 6 +- gdal/swig/python/samples/classify.py | 52 +- gdal/swig/python/samples/crs2crs2grid.py | 36 +- gdal/swig/python/samples/densify.py | 6 +- gdal/swig/python/samples/dump_jp2.py | 28 +- gdal/swig/python/samples/fft.py | 103 +-- gdal/swig/python/samples/fix_gpkg.py | 15 +- gdal/swig/python/samples/gcps2ogr.py | 84 +- gdal/swig/python/samples/gdal2grd.py | 148 ++-- gdal/swig/python/samples/gdal_cp.py | 9 +- gdal/swig/python/samples/gdal_create_pdf.py | 9 +- gdal/swig/python/samples/gdal_ls.py | 6 +- gdal/swig/python/samples/gdal_lut.py | 218 +++--- gdal/swig/python/samples/gdal_mkdir.py | 6 +- gdal/swig/python/samples/gdal_remove_towgs84.py | 126 +-- gdal/swig/python/samples/gdal_rm.py | 6 +- gdal/swig/python/samples/gdal_rmdir.py | 6 +- gdal/swig/python/samples/gdal_vrtmerge.py | 32 +- gdal/swig/python/samples/gdal_zip.py | 6 +- gdal/swig/python/samples/gdalcopyproj.py | 62 +- gdal/swig/python/samples/gdalfilter.py | 237 +++--- gdal/swig/python/samples/gdalinfo.py | 13 +- gdal/swig/python/samples/gdalpythonserver.py | 867 --------------------- gdal/swig/python/samples/get_soundg.py | 114 +-- gdal/swig/python/samples/histrep.py | 13 +- gdal/swig/python/samples/hsv_merge.py | 216 ++--- gdal/swig/python/samples/jpeg_in_tiff_extract.py | 14 +- gdal/swig/python/samples/load2odbc.py | 240 +++--- gdal/swig/python/samples/loslas2ntv2.py | 29 +- gdal/swig/python/samples/magphase.py | 39 +- .../python/samples/make_fuzzer_friendly_archive.py | 18 +- gdal/swig/python/samples/ogr2ogr.py | 61 +- gdal/swig/python/samples/ogr2vrt.py | 420 +++++----- .../python/samples/ogr_build_junction_table.py | 89 ++- gdal/swig/python/samples/ogr_dispatch.py | 13 +- gdal/swig/python/samples/ogr_layer_algebra.py | 13 +- gdal/swig/python/samples/ogrinfo.py | 12 +- gdal/swig/python/samples/ogrupdate.py | 9 +- gdal/swig/python/samples/rel.py | 275 +++---- gdal/swig/python/samples/tigerpoly.py | 275 +++---- .../swig/python/samples/tile_extent_from_raster.py | 76 +- gdal/swig/python/samples/tolatlong.py | 102 +-- gdal/swig/python/samples/val_at_coord.py | 152 ++-- gdal/swig/python/samples/val_repl.py | 121 +-- .../samples/validate_cloud_optimized_geotiff.py | 18 +- gdal/swig/python/samples/validate_gpkg.py | 25 +- gdal/swig/python/samples/validate_jp2.py | 32 +- gdal/swig/python/samples/vec_tr.py | 118 +-- gdal/swig/python/samples/vec_tr_spat.py | 158 ++-- gdal/swig/python/samples/wcs_virtds_params.py | 308 ++++---- gdal/swig/python/setup.py | 2 +- 114 files changed, 4383 insertions(+), 4091 deletions(-) create mode 100644 gdal/swig/python/osgeo/auxiliary/__init__.py create mode 100644 gdal/swig/python/osgeo/auxiliary/base.py delete mode 100644 gdal/swig/python/samples/README create mode 100644 gdal/swig/python/samples/README.md delete mode 100755 gdal/swig/python/samples/gdalpythonserver.py git reset --hard HEAD HEAD is now at 32bf61cc24 Merge pull request #3117 from talos-gis/Branch_py_refactor git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\gdal_revision.txt type E:\builds\release-1911\doc\gdal_revision.txt 32bf61cc243b8d24e5ed7f9ecf6869d1c21a65be cd E:\builds