From 5a8df734b449bf64c671851a7a533f88c6c6407a Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Tue, 29 Apr 2025 09:25:41 +1000 Subject: [PATCH 1/2] Update NEWS --- NEWS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 36fefcd5..f3750931 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ -Version 2.10-3, 2025-04-25 +Version 2.11-1, 2025-04-30 * Do not use nc-config compiler by default + * Use new R API functions for environments + * Use config.h to simplify compiler flags + * Call gc before opening datasets + - This may avoid corruption or crashes if a dataset is changed + unexpectedly when the garbage collector closes unreferenced ncids Version 2.10-2, 2025-04-15 * Fix bashism in configure.ac From 272ca7e1625569051ad3f9c9328f327be3416fa7 Mon Sep 17 00:00:00 2001 From: Milton Woods Date: Tue, 29 Apr 2025 09:27:44 +1000 Subject: [PATCH 2/2] Update version to 2.11-1 --- DESCRIPTION | 4 ++-- INSTALL | 4 ++-- configure | 18 +++++++++--------- configure.ac | 2 +- src/RNetCDF.h | 2 +- src/attribute.c | 2 +- src/common.c | 2 +- src/common.h | 2 +- src/convert.c | 2 +- src/convert.h | 2 +- src/dataset.c | 2 +- src/dimension.c | 2 +- src/group.c | 2 +- src/init.c | 2 +- src/type.c | 2 +- src/udunits.c | 2 +- src/variable.c | 2 +- tests/RNetCDF-test.R | 2 +- tools/convert.m4 | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 69b398ab..b493bbf6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: RNetCDF -Version: 2.10-3 -Date: 2025-04-25 +Version: 2.11-1 +Date: 2025-04-30 Title: Interface to 'NetCDF' Datasets Authors@R: c(person("Pavel", "Michna", role = "aut", email = "rnetcdf-devel@bluewin.ch"), diff --git a/INSTALL b/INSTALL index d0127823..35b428f1 100644 --- a/INSTALL +++ b/INSTALL @@ -97,7 +97,7 @@ R CMD INSTALL Example R CMD INSTALL --configure-args="CPPFLAGS=-I/sw/include \ LDFLAGS=-L/sw/lib LIBS=-lhdf5 --with-cc=mpicc --with-mpiexec=mpiexec" \ - RNetCDF_2.10-3.tar.gz + RNetCDF_2.11-1.tar.gz LD_LIBRARY_PATH @@ -126,7 +126,7 @@ R CMD check Example =================== R CMD check --install-args="--configure-args='CPPFLAGS=-I/sw/include \ - LDFLAGS=-L/sw/lib'" RNetCDF_2.10-3.tar.gz + LDFLAGS=-L/sw/lib'" RNetCDF_2.11-1.tar.gz Time units diff --git a/configure b/configure index f7786bde..a48f4df8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for RNetCDF 2.10-3. +# Generated by GNU Autoconf 2.72 for RNetCDF 2.11-1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, @@ -601,8 +601,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RNetCDF' PACKAGE_TARNAME='rnetcdf' -PACKAGE_VERSION='2.10-3' -PACKAGE_STRING='RNetCDF 2.10-3' +PACKAGE_VERSION='2.11-1' +PACKAGE_STRING='RNetCDF 2.11-1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures RNetCDF 2.10-3 to adapt to many kinds of systems. +'configure' configures RNetCDF 2.11-1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RNetCDF 2.10-3:";; + short | recursive ) echo "Configuration of RNetCDF 2.11-1:";; esac cat <<\_ACEOF @@ -1412,7 +1412,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RNetCDF configure 2.10-3 +RNetCDF configure 2.11-1 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -1929,7 +1929,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RNetCDF $as_me 2.10-3, which was +It was created by RNetCDF $as_me 2.11-1, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -7542,7 +7542,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RNetCDF $as_me 2.10-3, which was +This file was extended by RNetCDF $as_me 2.11-1, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7606,7 +7606,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -RNetCDF config.status 2.10-3 +RNetCDF config.status 2.11-1 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 45e0ec1f..c6f8222c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Initialize # #-------------------------------------------------------------------------------# -AC_INIT([RNetCDF],[2.10-3]) +AC_INIT([RNetCDF],[2.11-1]) : ${R_HOME=`R RHOME`} AS_IF([test -z "${R_HOME}"], diff --git a/src/RNetCDF.h b/src/RNetCDF.h index 31f1b352..3b3770e1 100644 --- a/src/RNetCDF.h +++ b/src/RNetCDF.h @@ -2,7 +2,7 @@ * * Name: RNetCDF.h * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: Declare RNetCDF functions callable from R * diff --git a/src/attribute.c b/src/attribute.c index bb6e6066..ffe8d0cc 100644 --- a/src/attribute.c +++ b/src/attribute.c @@ -2,7 +2,7 @@ * * Name: attribute.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: NetCDF attribute functions for RNetCDF * diff --git a/src/common.c b/src/common.c index d7a19cfb..7746e321 100644 --- a/src/common.c +++ b/src/common.c @@ -2,7 +2,7 @@ * * Name: common.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: Common definitions for RNetCDF functions * diff --git a/src/common.h b/src/common.h index b6b96478..6e703098 100644 --- a/src/common.h +++ b/src/common.h @@ -2,7 +2,7 @@ * * Name: common.h * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: Common definitions for RNetCDF functions * diff --git a/src/convert.c b/src/convert.c index 1dbae5c3..da25f4e1 100644 --- a/src/convert.c +++ b/src/convert.c @@ -4,7 +4,7 @@ * * Name: convert.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: Type conversions for RNetCDF * diff --git a/src/convert.h b/src/convert.h index c37a4a1f..98c3c666 100644 --- a/src/convert.h +++ b/src/convert.h @@ -2,7 +2,7 @@ * * Name: convert.h * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: Type conversions for RNetCDF * diff --git a/src/dataset.c b/src/dataset.c index 2d569eef..8676afbb 100644 --- a/src/dataset.c +++ b/src/dataset.c @@ -2,7 +2,7 @@ * * Name: dataset.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: NetCDF dataset functions for RNetCDF * diff --git a/src/dimension.c b/src/dimension.c index c7a1fce5..4c0c79df 100644 --- a/src/dimension.c +++ b/src/dimension.c @@ -2,7 +2,7 @@ * * Name: dimension.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: NetCDF dimension functions for RNetCDF * diff --git a/src/group.c b/src/group.c index 9a451df8..4c4a533d 100644 --- a/src/group.c +++ b/src/group.c @@ -2,7 +2,7 @@ * * Name: group.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: NetCDF group functions for RNetCDF. * diff --git a/src/init.c b/src/init.c index 3a9fd0c2..a6d2e9ac 100644 --- a/src/init.c +++ b/src/init.c @@ -2,7 +2,7 @@ * * Name: common.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: RNetCDF initialisation * diff --git a/src/type.c b/src/type.c index 127fdb4e..54ca435d 100644 --- a/src/type.c +++ b/src/type.c @@ -2,7 +2,7 @@ * * Name: type.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: NetCDF type functions for RNetCDF * diff --git a/src/udunits.c b/src/udunits.c index c73ede01..6f1c39c5 100644 --- a/src/udunits.c +++ b/src/udunits.c @@ -2,7 +2,7 @@ * * Name: udunits.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: udunits2 functions for RNetCDF. * diff --git a/src/variable.c b/src/variable.c index 6c15e790..711d77c0 100644 --- a/src/variable.c +++ b/src/variable.c @@ -2,7 +2,7 @@ * * Name: variable.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: NetCDF variable functions for RNetCDF * diff --git a/tests/RNetCDF-test.R b/tests/RNetCDF-test.R index 2b8d0ad0..4f2b29a8 100644 --- a/tests/RNetCDF-test.R +++ b/tests/RNetCDF-test.R @@ -2,7 +2,7 @@ # # Name: RNetCDF-test.R # -# Version: 2.10-3 +# Version: 2.11-1 # # Purpose: Test functions to the NetCDF interface for R. # diff --git a/tools/convert.m4 b/tools/convert.m4 index 7fb6bd4f..67f5af90 100644 --- a/tools/convert.m4 +++ b/tools/convert.m4 @@ -5,7 +5,7 @@ dnl Insert warning into generated C code: * * Name: convert.c * - * Version: 2.10-3 + * Version: 2.11-1 * * Purpose: Type conversions for RNetCDF *