From 03c47d61f9c03a4b90eba07a9261cf0157e9edd8 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 19 Nov 2024 16:38:11 -0700 Subject: [PATCH 1/4] Preparing for release candidate 2. --- RELEASE_NOTES.md | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7475de2d26..c4d1e8774a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -15,7 +15,7 @@ This file contains a high-level description of this package's evolution. Release ## Release Notes -### Release Candidate 2 - TBD +### Release Candidate 2 - November 20, 2024 > Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake. These are turned on by default currently but will be turned off eventually. Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro. See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information. diff --git a/configure.ac b/configure.ac index 89d04efebe..2f4b4a22ed 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development" # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning # for information regarding incrementing `-version-info`. # These values should match those in CMakeLists.txt -AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=22:0:0 +AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=23:0:1 ##### # Set some variables used to generate a libnetcdf.settings file, From 20427fede1f123ba650c455fffc2ff18e0965548 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 21 Nov 2024 15:13:08 -0700 Subject: [PATCH 2/4] The echon implementation is hanging in an infinite loop, so reverting to 'echo -n' and observing what errors are observed on MacOS and Windows. --- test_common.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test_common.in b/test_common.in index 5a3d1c29e9..97c4208b15 100644 --- a/test_common.in +++ b/test_common.in @@ -201,7 +201,8 @@ fi # OS/X and windows apparently have no echo -n option, so fake it echon() { - ${execdir}/../ncdump/echon -n $@ + echo -n $@ + #${execdir}/../ncdump/echon -n $@ } # Test for filter availability From 451cba565a2db71f4abad215bbf3adbbb88f3b52 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 21 Nov 2024 15:13:26 -0700 Subject: [PATCH 3/4] Updated release notes. --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c4d1e8774a..fcc3491c5e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -15,7 +15,7 @@ This file contains a high-level description of this package's evolution. Release ## Release Notes -### Release Candidate 2 - November 20, 2024 +### Release Candidate 2 - November 22, 2024 > Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake. These are turned on by default currently but will be turned off eventually. Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro. See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information. From 57149a43e5aabfbddc2e2846af7aa59f6441b725 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 22 Nov 2024 12:20:59 -0700 Subject: [PATCH 4/4] Attempting a different portable approach --- test_common.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_common.in b/test_common.in index 5a3d1c29e9..8786568768 100644 --- a/test_common.in +++ b/test_common.in @@ -201,7 +201,7 @@ fi # OS/X and windows apparently have no echo -n option, so fake it echon() { - ${execdir}/../ncdump/echon -n $@ + echo $@ | tr -d '\n' } # Test for filter availability