Merge pull request #462 from Unidata/v4.6.2-wellspring.wif

Merge changes back upstream into development branch.

Author: WardF

CMakeLists.txt

@@ -24,7 +24,7 @@ set(PACKAGE "${NC4F_CTEST_PROJECT_NAME}" CACHE STRING "")
 SET(NC4F_VERSION_MAJOR 4)
 SET(NC4F_VERSION_MINOR 6)
 
-SET(NC4F_VERSION_PATCH 2)
+SET(NC4F_VERSION_PATCH 3)
 SET(NC4F_VERSION_NOTE "-development")
 SET(NC4F_VERSION ${NC4F_VERSION_MAJOR}.${NC4F_VERSION_MINOR}.${NC4F_VERSION_PATCH}${NC4F_VERSION_NOTE})
 SET(VERSION ${NC4F_VERSION})
@@ -65,6 +65,8 @@ ENDIF()
 # End BUILDNAME customization.
 ###
 
+set(abs_top_builddir "${CMAKE_CURRENT_BINARY_DIR}")
+set(abs_top_srcdir "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # Determine if DOXYGEN and DOT are available. These will be used
 # when building the documentation.

Makefile.am

@@ -36,7 +36,7 @@ check_nc_config:
 # These files get added to the distribution.
 EXTRA_DIST = README.md RELEASE_NOTES.md netcdf-fortran.pc.in	\
 F03Interfaces_LICENSE CMakeLists.txt COPYRIGHT nf-config.in	\
-config.h.cmake.in CTestConfig.cmake.in nf-config.cmake.in \
+config.h.cmake.in CTestConfig.cmake.in \
 libnetcdff.settings.in netCDF-FortranConfig.cmake.in
 
 # Remove these generated files, for a distclean.

RELEASE_NOTES.md

@@ -6,6 +6,36 @@ Release Notes {#nf_release_notes}
 This file contains a high-level description of this package's evolution.
 Entries are in reverse chronological order (most recent first).
 
+## 4.6.2 - March 26, 2025
+
+### Requirements
+
+* netCDF-C: 4.9.2+
+
+  Note: to enable `libzstd` support, you need to satisfy the following requirements.
+  
+  1. `libnetcdf.so` installed with `libzstd` support.
+  2. The environmental variable `HDF5_LIBRARY_PATH` needs to be specified to the same location used when installing `libnetcdf`.  This can be determined after-the-fact using `nc-config --plugindir`.  
+
+### What's Changed
+
+* Fixed an issue in `ftst` tests which was the result of an incompatibility with netCDF-C `v4.9.3`
+
+
+### 4.6.2-rc1 - October 21, 2024
+
+### Requirements
+
+* netCDF-C: 4.9.2+
+
+  Note: to enable `libzstd` support, you need to satisfy the following requirements.
+  
+  1. `libnetcdf.so` installed with `libzstd` support.
+  2. The environmental variable `HDF5_LIBRARY_PATH` needs to be specified to the same location used when installing `libnetcdf`.  This can be determined after-the-fact using `nc-config --plugindir`.  
+
+### What's Changed
+
+
 ## 4.6.1 - May 19, 2023
 
 ### Requirements

configure.ac

@@ -10,7 +10,7 @@ AC_PREREQ([2.59])
 
 # Initialize with name, version, and support email address.
 
-AC_INIT([netCDF-Fortran], [4.6.2-development], [support-netcdf@unidata.ucar.edu])
+AC_INIT([netCDF-Fortran], [4.6.3-development], [support-netcdf@unidata.ucar.edu])
 
 
 # Create the VERSION file, which contains the package version from

docs/Doxyfile.developer

@@ -53,7 +53,7 @@ Doxyfile.in netcdf-f77.md netcdf-f90-sec1-usage.md			\
 netcdf-f90-sec3-groups.md netcdf-f90-sec5-user_defined_types.md		\
 netcdf-f90-sec7-attributes.md netcdf-f90.md				\
 netcdf-f90-sec2-datasets.md netcdf-f90-sec4-dimensions.md		\
-netcdf-f90-sec6-variables.md
+netcdf-f90-sec6-variables.md doxygen-awesome-css header.html footer.html
 
 CLEANFILES = doxyfile.stamp