Skip to content

Commit

Permalink
Prepare for release 2.5-1 (#91)
Browse files Browse the repository at this point in the history
* Update NEWS for release 2.5-1

* Use GNU utilities on MacOS

* Update Copyright dates in release.sh

* Limit lines matched by version number in release.sh

* Revert version in DESCRIPTION to match version in other files

* Update versions and dates for release 2.5-1

* Update NEWS and DESCRIPTION
  • Loading branch information
mjwoods authored Aug 17, 2021
1 parent b1f26d2 commit b159baf
Show file tree
Hide file tree
Showing 23 changed files with 71 additions and 67 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: RNetCDF
Version: 2.5-0
Date: 2021-07-26
Version: 2.5-1
Date: 2021-08-16
Title: Interface to 'NetCDF' Datasets
Authors@R: c(person("Pavel", "Michna", role = "aut",
email = "[email protected]"),
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ R CMD INSTALL Example
=====================

R CMD INSTALL --configure-args="CPPFLAGS=-I/sw/include \
LDFLAGS=-L/sw/lib LIBS=-lhdf5" RNetCDF_2.4-2.tar.gz
LDFLAGS=-L/sw/lib LIBS=-lhdf5" RNetCDF_2.5-1.tar.gz


LD_LIBRARY_PATH
Expand Down Expand Up @@ -68,7 +68,7 @@ R CMD check Example
===================

R CMD check --install-args="--configure-args='CPPFLAGS=-I/sw/include \
LDFLAGS=-L/sw/lib'" RNetCDF_2.4-2.tar.gz
LDFLAGS=-L/sw/lib'" RNetCDF_2.5-1.tar.gz


Time units
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RNetCDF
=======

All files except those indicated later are
Copyright (C) 2004-2020 Pavel Michna and Milton Woods.
Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
They are licensed under the terms of the GNU General Public License:

This program is free software; you can redistribute it and/or modify
Expand Down
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 2.5-1, 2021-08-08
* Support hdf5 filters via multi-filter interface (netcdf>=4.8.0)
* Windows: update binary packages to netcdf 4.7.4 with OpenDAP
* Generate type conversions with m4 macros

Version 2.4-2, 2020-09-12
* Support reading/writing special values (e.g. NA, Inf) without substitution,
mainly in cases where type conversion between R and NetCDF is not required.
Expand Down
2 changes: 1 addition & 1 deletion R/RNetCDF.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Author: Pavel Michna ([email protected])
# Milton Woods ([email protected])
#
# Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
# Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
#
#===============================================================================
#
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for RNetCDF 2.4-2.
# Generated by GNU Autoconf 2.71 for RNetCDF 2.5-1.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
Expand Down Expand Up @@ -608,8 +608,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='RNetCDF'
PACKAGE_TARNAME='rnetcdf'
PACKAGE_VERSION='2.4-2'
PACKAGE_STRING='RNetCDF 2.4-2'
PACKAGE_VERSION='2.5-1'
PACKAGE_STRING='RNetCDF 2.5-1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1255,7 +1255,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.4-2 to adapt to many kinds of systems.
\`configure' configures RNetCDF 2.5-1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1317,7 +1317,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of RNetCDF 2.4-2:";;
short | recursive ) echo "Configuration of RNetCDF 2.5-1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1402,7 +1402,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
RNetCDF configure 2.4-2
RNetCDF configure 2.5-1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1852,7 +1852,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.4-2, which was
It was created by RNetCDF $as_me 2.5-1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -4615,7 +4615,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.4-2, which was
This file was extended by RNetCDF $as_me 2.5-1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4670,7 +4670,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.4-2
RNetCDF config.status 2.5-1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Initialize #
#-------------------------------------------------------------------------------#

AC_INIT([RNetCDF],[2.4-2])
AC_INIT([RNetCDF],[2.5-1])

#-------------------------------------------------------------------------------#
# Find the compiler and compiler options to use for tests #
Expand Down
4 changes: 2 additions & 2 deletions src/RNetCDF.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: RNetCDF.h
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: Declare RNetCDF functions callable from R
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/attribute.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: attribute.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: NetCDF attribute functions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: common.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: Common definitions for RNetCDF functions
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: common.h
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: Common definitions for RNetCDF functions
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*
* Name: convert.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: Type conversions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/convert.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: convert.h
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: Type conversions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/dataset.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: dataset.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: NetCDF dataset functions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/dimension.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: dimension.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: NetCDF dimension functions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/group.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: group.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: NetCDF group functions for RNetCDF.
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: common.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: RNetCDF initialisation
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/type.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: type.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: NetCDF type functions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/udunits.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: udunits.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: udunits2 functions for RNetCDF.
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions src/variable.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
*
* Name: variable.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: NetCDF variable functions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
4 changes: 2 additions & 2 deletions tests/RNetCDF-test.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
#
# Name: RNetCDF-test.R
#
# Version: 2.4-2
# Version: 2.5-1
#
# Purpose: Test functions to the NetCDF interface for R.
#
# Author: Pavel Michna ([email protected])
# Milton Woods ([email protected])
#
# Copyright: (C) 2010-2020 Pavel Michna, Milton Woods
# Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
#
#===============================================================================#
#
Expand Down
4 changes: 2 additions & 2 deletions tools/convert.m4
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ dnl Insert warning into generated C code:
*
* Name: convert.c
*
* Version: 2.4-2
* Version: 2.5-1
*
* Purpose: Type conversions for RNetCDF
*
* Author: Pavel Michna ([email protected])
* Milton Woods ([email protected])
*
* Copyright: (C) 2004-2020 Pavel Michna, Milton Woods
* Copyright (C) 2004-2021 Pavel Michna and Milton Woods.
*
*=============================================================================*
*
Expand Down
Loading

0 comments on commit b159baf

Please sign in to comment.