Wellspring for v4.6.2-rc1 release

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})

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,45 @@ 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 - TBD
+
+### 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
+
+## What's Changed
+* Merge v4.6.1 wellspring back in to `main` development branch. by @WardF in https://github.com/Unidata/netcdf-fortran/pull/400
+* nf-config uses install libdir variable by @WardF in https://github.com/Unidata/netcdf-fortran/pull/418
+* Remove autoconf-generated distribution files by @WardF in https://github.com/Unidata/netcdf-fortran/pull/420
+* Check for either the old or new default values in ftst_vars.F by @WardF in https://github.com/Unidata/netcdf-fortran/pull/421
+* Attempt to fix a pernicious issue where some systems complain about no implicit type. by @WardF in https://github.com/Unidata/netcdf-fortran/pull/429
+* Use install directory that matches package name by @islas in https://github.com/Unidata/netcdf-fortran/pull/428
+* fix intents and variable types in interfaces by @rwirth in https://github.com/Unidata/netcdf-fortran/pull/424
+* Clarify 'netCDF-C 4.7.4 or greater required' message. by @WardF in https://github.com/Unidata/netcdf-fortran/pull/430
+* Clarify message when failing with 'requires v4.7.4' error.  by @WardF in https://github.com/Unidata/netcdf-fortran/pull/431
+* CI: use modern actions and cmake calls by @scivision in https://github.com/Unidata/netcdf-fortran/pull/433
+* CMake remove deprecated syntax by @scivision in https://github.com/Unidata/netcdf-fortran/pull/432
+* CMake: Fix some issues when linking against netcdf-C by @ZedThree in https://github.com/Unidata/netcdf-fortran/pull/435
+* Use consistent `nf-config.in` template for both CMake/autotools by @ZedThree in https://github.com/Unidata/netcdf-fortran/pull/434
+* Remove vestigial files that shouldn't have been included in version control by @WardF in https://github.com/Unidata/netcdf-fortran/pull/422
+* Fix Stack Overflow problem by moving large arrays from the stack to the heap by @Roy-KC in https://github.com/Unidata/netcdf-fortran/pull/410
+
+## New Contributors
+* @islas made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/428
+* @rwirth made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/424
+* @Roy-KC made their first contribution in https://github.com/Unidata/netcdf-fortran/pull/410
+
+**Full Changelog**: https://github.com/Unidata/netcdf-fortran/compare/v4.6.1...v4.6.2-rc1-tmp
+
 ## 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], [[email protected]])
+AC_INIT([netCDF-Fortran], [4.6.3-development], [[email protected]])
 
 
 # Create the VERSION file, which contains the package version from

docs/Doxyfile.developer

@@ -39,7 +39,7 @@ PROJECT_NAME           = netcdf-fortran
 # control system is used.
 
 
-PROJECT_NUMBER         = 4.6.2-Development
+PROJECT_NUMBER         = 4.6.3-Development
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

examples/F77/CMakeLists.txt

@@ -19,10 +19,11 @@ FOREACH(F ${example_F77_tests})
   ENDIF()	
 ENDFOREACH()
 
-## Specify files to be distributed by 'make dist'
-FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.F ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
+# Set some order dependencies on tests
+set_tests_properties(F77_tests_simple_xy_rd PROPERTIES DEPENDS "F77_tests_simple_xy_wr")
+set_tests_properties(F77_tests_sfc_pres_temp_rd PROPERTIES DEPENDS "F77_tests_sfc_pres_temp_wr")
+set_tests_properties(F77_tests_pres_temp_4D_rd PROPERTIES DEPENDS "F77_tests_pres_temp_4D_wr")
+
 
 SET(CLEANFILES sfc_pres_temp.nc simple_xy.nc pres_temp_4D.nc simple_nc4.nc simple_xy_nc4.nc)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

examples/F90/CMakeLists.txt

@@ -30,9 +30,14 @@ IF(TEST_PARALLEL)
   build_bin_test(simple_xy_par_wr .F90)
   build_bin_test(simple_xy_par_rd .F90)
   build_bin_test(simple_xy_par_wr2 .F90)
+
   add_sh_test(f90_tests run_f90_par_examples)
 ENDIF(TEST_PARALLEL)
 
+# Set some order dependencies on tests
+set_tests_properties(F90_tests_simple_xy_rd PROPERTIES DEPENDS "F90_tests_simple_xy_wr")
+set_tests_properties(F90_tests_sfc_pres_temp_rd PROPERTIES DEPENDS "F90_tests_sfc_pres_temp_wr")
+set_tests_properties(F90_tests_pres_temp_4D_rd PROPERTIES DEPENDS "F90_tests_pres_temp_4D_wr")
 
 SET(CLEANFILES sfc_pres_temp.nc simple_xy.nc pres_temp_4D.nc simple_nc4.nc simple_xy_nc4.nc)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")

fortran/Makefile.am

@@ -14,7 +14,7 @@ lib_LTLIBRARIES = libnetcdff.la
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
 # for information regarding incrementing `-version-info`.
-libnetcdff_la_LDFLAGS = -version-info 9:0:2
+libnetcdff_la_LDFLAGS = -version-info 9:1:2
 
 # These F90 codes are used for either netCDF classic or netCDF-4 F90
 # API.