Prepare for GDAL 3.6.0

PPazderski · Nov 3, 2022 · bc8cb19 · bc8cb19
1 parent dae35e2
commit bc8cb19
Show file tree

Hide file tree

Showing 12 changed files with 636 additions and 233 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: Please cite this software using these metadata or in the CITATION file.
 type: software
 title: GDAL
-version: 3.5.3
-date-released: 2022-10-21
+version: 3.6.0
+date-released: 2022-11-03
 doi: 10.5281/zenodo.5884351
 abstract: GDAL is a translator library for raster and vector geospatial data
   formats that is released under an MIT style Open Source License by the Open

diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
@@ -32,7 +32,7 @@ Process :
 1) a) Regenerate swig generated files for python bindings and commit if changed.
       Currently SWIG 4.0.2 is used.
 
-   b) "cd scripts; make completion" to regenerate scripts/gdal-bash-completion.sh
+   b) "make completion" to regenerate scripts/gdal-bash-completion.sh
       if new command line switches have been added. scripts/completionFinder.py
       must also be edited before if new utilities/scripts are added/removed.
 
@@ -48,23 +48,20 @@ Process :
 3) Update the VERSION file (if not already done)
 
 3.1) Update the version information in the following files:
-     - ./swig/python/setup.py (gdal python package)
      - ./swig/python/gdal-utils/osgeo_utils/__init__.py (gdal-utils python package)
      - ./swig/python/README.rst (libgdal)
 
-3.2) For major releases update the VERSION macro in nmake.opt (for 1.6, 1.7etc)
-
 4) Update the GDAL_SOVERSION number at top of gdal.cmake according to the
    directions given in the comment preceding it.
 
-5) Prepare release overview in the NEWS file. For example, to get all changes
+5) Prepare release overview in the NEWS.md file. For example, to get all changes
    from v3.4.0 to current HEAD
      git log --reverse -v v3.4.0..HEAD . ":(exclude)autotest" ":(exclude)doc" ":(exclude).github"
 
-  - commit new version to NEWS file.
+   For a feature release, e.g 3.6.0, you can use scripts/generate_log_feature_release.py to generate a log without commit that went in the previous 3.5.x bugfix releases with:
+     python scripts/generate_log_feature_release.py
 
-  Create a News page in Trac for the release, like
-    http://trac.osgeo.org/gdal/wiki/Release/3.1.0-News
+  - commit new version to NEWS.md file.
 
 6) If this is a feature release (e.g 3.1), prepare a branch.
 

diff --git a/NEWS.md b/NEWS.md
diff --git a/NEWS.template b/NEWS.template
@@ -1,232 +1,43 @@
-= GDAL/OGR X.Y.Z Release Notes (r25919 to rXXXXX) =
+# GDAL/OGR X.Y.Z Release Notes
 
-== In a nutshell... ==
+## In a nutshell...
 
- * New GDAL drivers:
- * New OGR drivers:
- * For feature version, generally: Bump of shared lib major version
+## New optional dependencies
 
+## New installed files
 
-== New installed files ==
+## Removed files
 
-== Backward compatibility issues ==
+## Backward compatibility issues
 
-== GDAL/OGR X.Y.Z - General Changes ==
+See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/X.Y/MIGRATION_GUIDE.TXT)
 
-Build(Unix):
+## Build changes
 
-Build(Windows):
+## Internal libraries
 
-== GDAL X.Y.Z - Overview of Changes ==
+## GDAL X.Y.Z - Overview of Changes
 
-Port:
+### Port
 
-Core:
+### Core
 
-Algorithms:
+### Algorithms
 
-Utilities:
+### Utilities
 
-Multi driver changes:
+### gdal_utils package
 
-AAIGrid:
+### Raster drivers
 
-ACE2 driver:
+## OGR X.Y.Z - Overview of Changes
 
-ADRG driver:
+### Core
 
-BAG driver:
+### OGRSpatialReference
 
-BT driver:
+### Utilities
 
-CEOS2 driver:
+### Vector drivers
 
-DIMAP driver:
-
-DTED driver:
-
-ECW driver:
-
-ENVI driver:
-
-ENVISAT driver:
-
-GeoRaster driver:
-
-GIF driver:
-
-GMT driver:
-
-GTiff driver:
-
-GRIB driver:
-
-GSAG driver:
-
-GS7BG driver:
-
-GTX driver:
-
-GXF driver:
-
-HDF4 driver:
-
-HDF5 driver:
-
-HFA driver:
-
-INGR driver:
-
-ISIS3 driver:
-
-JP2ECW driver:
-
-JP2KAK driver:
-
-JP2OpenJPEG driver:
-
-JPEG driver:
-
-JPEG2000 driver:
-
-KMLSuperOverlay driver:
-
-L1B driver:
-
-MG4Lidar driver:
-
-NetCDF driver:
-
-NITF driver:
-
-Northwood driver:
-
-PDF driver:
-
-PNG driver:
-
-PostgisRaster driver:
-
-Rasterlite driver:
-
-RMF driver:
-
-RPFTOC driver:
-
-RS2 driver:
-
-SDTS driver:
-
-SRP driver:
-
-TIL driver:
-
-TSX driver:
-
-VRT driver:
-
-WCS driver:
-
-WebP driver:
-
-WMS driver:
-
-XYZ driver:
-
-== OGR X.Y.Z - Overview of Changes ==
-
-Core:
-
-OGRSpatialReference:
-
-Utilities:
-
-Multi driver changes:
-
-AVCE00 driver:
-
-AVCBin driver:
-
-CSV driver:
-
-DGN driver:
-
-DXF driver:
-
-FileGDB driver:
-
-Geoconcept driver:
-
-GeoJSON driver:
-
-Geomedia driver:
-
-GFT driver:
-
-GML driver:
-
-ILI driver:
-
-Ingres driver:
-
-KML driver:
-
-Idrisi driver:
-
-LIBKML driver:
-
-MITAB driver:
-
-MSSQLSpatial driver:
-
-MySQL:
-
-NAS driver:
-
-NULL driver:
-
-OCI driver:
-
-ODBC driver:
-
-NTF driver:
-
-OCI driver:
-
-PGeo driver:
-
-PG driver:
-
-PGDump driver:
-
-REC driver:
-
-SDE driver:
-
-Shapefile driver:
-
-S57 driver:
-
-SQLite/Spatialite driver:
-
-TIGER driver:
-
-VFK driver:
-
-VRT driver:
-
-WFS driver:
-
-XLS driver:
-
-== SWIG Language Bindings ==
-
-All bindings:
-
-CSharp bindings:
-
-Java bindings:
-
-Perl bindings:
-
-Python bindings:
+## SWIG Language Bindings
diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20229999
+#  define GDAL_RELEASE_DATE     20221103
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.6.0dev"
+#  define GDAL_RELEASE_NAME     "3.6.0"
 #endif
 #endif
diff --git a/gdal.cmake b/gdal.cmake
@@ -6,8 +6,8 @@
 # a new member or virtual function in a public C++ class, etc.
 # This will typically happen for each GDAL feature release (change of X or Y in
 # a X.Y.Z numbering scheme), but should not happen for a bugfix release (change of Z)
-# Previous value: 31 for GDAL 3.5
-set(GDAL_SOVERSION 31)
+# Previous value: 32 for GDAL 3.6
+set(GDAL_SOVERSION 32)
 
 # Switches to control build targets(cached)
 option(ENABLE_GNM "Build GNM (Geography Network Model) component" ON)

diff --git a/scripts/completionFinder.py b/scripts/completionFinder.py
@@ -254,7 +254,14 @@ def main(argv):
         "gdal_create",
     ]
 
-    ogrtools = ["ogr2ogr", "ogrinfo", "ogrlineref", "ogrtindex", "ogrmerge.py"]
+    ogrtools = [
+        "ogr2ogr",
+        "ogrinfo",
+        "ogrlineref",
+        "ogrtindex",
+        "ogrmerge.py",
+        "ogr_layer_algebra.py",
+    ]
 
     # parse general options
     generalOptions = parseGDALGeneralOptions()