Merge pull request #1482 from Unidata/v4.7.1-wellspring.wif

Merge some changes from 4.7.1 preparation back upstream into master.

CMakeLists.txt

@@ -26,7 +26,7 @@ set(PACKAGE "netCDF" CACHE STRING "")
 
 SET(NC_VERSION_MAJOR 4)
 SET(NC_VERSION_MINOR 7)
-SET(NC_VERSION_PATCH 1)
+SET(NC_VERSION_PATCH 2)
 SET(NC_VERSION_NOTE "-development")
 SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
 SET(VERSION ${netCDF_VERSION})

INSTALL.md

@@ -4,7 +4,7 @@ Getting and Building netCDF {#getting_and_building_netcdf}
 [TOC]
 
 This document is for getting and building the netCDF C library and
-utilities, version 4.3.0.  Other libraries that depend on the netCDF C
+utilities, version 4.7.1 and later.  Other libraries that depend on the netCDF C
 library, such as the Fortran and C++ libraries, are available as
 separate distributions that can be built and installed after the C
 library is successfully installed.  The netCDF-Java library is also a
@@ -84,6 +84,10 @@ Requirements {#netcdf_requirements}
 * zlib 1.2.5
 * curl 7.18.0 (DAP support)
 
+> Note: If you are working with a development version of the source code, you will need to generate the `configure` script by running the following command from the top-level `netcdf-c/` directory:
+
+> **$ autoreconf -if**
+
 
 CMake and Windows support {#sub}
 --------------------------------

RELEASE_NOTES.md

@@ -5,31 +5,17 @@ Release Notes       {#RELEASE_NOTES}
 
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 
-## 4.7.1 - TBD
+## 4.7.2 - TBD
 
-* [Enhancement] Added unit_test directory, which contains unit tests
-for the libdispatch and libsrc4 code (and any other directories that
-want to put unit tests there). Use --disable-unit-tests to run without
-unit tests (ex. for code coverage analysis).
-See [GitHub #1458](https://github.com/Unidata/netcdf-c/issues/1458)
+## 4.7.1 - August 27, 2019
 
-* [Bug Fix] Remove obsolete _CRAYMPP and LOCKNUMREC macros from
-code. Also brought documentation up to date in man page. These macros
-were used in ancient times, before modern parallel I/O systems were
-developed. Programmers interested in parallel I/O should see
-nc_open_par() and nc_create_par().
-See [GitHub #1459](https://github.com/Unidata/netcdf-c/issues/1459)
+* [Enhancement] Added unit_test directory, which contains unit tests for the libdispatch and libsrc4 code (and any other directories that want to put unit tests there). Use --disable-unit-tests to run without unit tests (ex. for code coverage analysis). See [GitHub #1458](https://github.com/Unidata/netcdf-c/issues/1458).
 
-* [Enhancement] Remove obsolete and deprecated functions
-nc_set_base_pe() and nc_inq_base_pe() from the dispatch table. (Both
-functions are still supported in the library, this is an internal
-change only.)
-See [GitHub #1468](https://github.com/Unidata/netcdf-c/issues/1468)
- 
-* [Bug Fix] Reverted nccopy behavior so that if no -c parameters
-are given, then any default chunking is left to the netcdf-c library
-to decide.
-See [GitHub #1436](https://github.com/Unidata/netcdf-c/issues/1436)
+* [Bug Fix] Remove obsolete _CRAYMPP and LOCKNUMREC macros from code. Also brought documentation up to date in man page. These macros were used in ancient times, before modern parallel I/O systems were developed. Programmers interested in parallel I/O should see nc_open_par() and nc_create_par(). See [GitHub #1459](https://github.com/Unidata/netcdf-c/issues/1459).
+
+* [Enhancement] Remove obsolete and deprecated functions nc_set_base_pe() and nc_inq_base_pe() from the dispatch table. (Both functions are still supported in the library, this is an internal change only.) See [GitHub #1468](https://github.com/Unidata/netcdf-c/issues/1468).
+
+* [Bug Fix] Reverted nccopy behavior so that if no -c parameters are given, then any default chunking is left to the netcdf-c library to decide. See [GitHub #1436](https://github.com/Unidata/netcdf-c/issues/1436).
 
 ## 4.7.0 - April 29, 2019
 

configure.ac

@@ -10,7 +10,7 @@
 AC_PREREQ([2.59])
 
 # Initialize with name, version, and support email address.
-AC_INIT([netCDF], [4.7.1-development], [support-netcdf@unidata.ucar.edu], [netcdf-c])
+AC_INIT([netCDF], [4.7.2-development], [support-netcdf@unidata.ucar.edu], [netcdf-c])
 
 ##
 # Prefer an empty CFLAGS variable instead of the default -g -O2.
@@ -21,7 +21,7 @@ AC_INIT([netCDF], [4.7.1-development], [support-netcdf@unidata.ucar.edu], [netcd
 
 AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4
 AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=7
-AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=1
+AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=2
 AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development"
 
 #####

docs/Doxyfile.developer

@@ -38,7 +38,7 @@ PROJECT_NAME           = netCDF-C
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.7.1-development
+PROJECT_NUMBER         = 4.7.2-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

liblib/Makefile.am

@@ -18,7 +18,7 @@ lib_LTLIBRARIES = libnetcdf.la
 # for information regarding incrementing `-version-info`.
 ##
 
-libnetcdf_la_LDFLAGS = -version-info 15:1:0
+libnetcdf_la_LDFLAGS = -version-info 16:0:1
 
 libnetcdf_la_CPPFLAGS = ${AM_CPPFLAGS}
 libnetcdf_la_LIBADD =