diff --git a/CMakeLists.txt b/CMakeLists.txt index ea48c9efa..65cd96174 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,14 +25,14 @@ set(PACKAGE "netCDF" CACHE STRING "") ##### SET(NC_VERSION_MAJOR 4) -SET(NC_VERSION_MINOR 7) -SET(NC_VERSION_PATCH 4) +SET(NC_VERSION_MINOR 8) +SET(NC_VERSION_PATCH 0) SET(NC_VERSION_NOTE "-development") SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE}) SET(VERSION ${netCDF_VERSION}) SET(NC_VERSION ${netCDF_VERSION}) -SET(netCDF_LIB_VERSION 15) -SET(netCDF_SO_VERSION 15) +SET(netCDF_LIB_VERSION 18) +SET(netCDF_SO_VERSION 18) SET(PACKAGE_VERSION ${VERSION}) # Version of the dispatch table, in case we change it. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9d91ed0e3..7506065ed 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -5,8 +5,11 @@ 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.4 - TBD +## 4.8.0 - TBD +## 4.7.4 - March 27, 2020 + +* [Windows] Bumped packaged HDF5 to 1.10.6, HDF4 to 4.2.14, and libcurl to 7.60.0. * [Enhancement] Support has been added for HDF5-1.12.0. See [https://github.com/Unidata/netcdf-c/issues/1528]. * [Bug Fix] Correct behavior for the command line utilities when directly accessing a directory using utf8 characters. See [Github #1669](https://github.com/Unidata/netcdf-c/issues/1669), [Github #1668](https://github.com/Unidata/netcdf-c/issues/1668) and [Github #1666](https://github.com/Unidata/netcdf-c/issues/1666) for more information. * [Bug Fix] Attempts to set filters or chunked storage on scalar vars will now return NC_EINVAL. Scalar vars cannot be chunked, and only chunked vars can have filters. Previously the library ignored these attempts, and always storing scalars as contiguous storage. See [https://github.com/Unidata/netcdf-c/issues/1644]. diff --git a/configure.ac b/configure.ac index 4c86b2116..82781217d 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ([2.59]) # Initialize with name, version, and support email address. -AC_INIT([netCDF], [4.7.4-development], [support-netcdf@unidata.ucar.edu], [netcdf-c]) +AC_INIT([netCDF], [4.8.0-development], [support-netcdf@unidata.ucar.edu], [netcdf-c]) ## # Prefer an empty CFLAGS variable instead of the default -g -O2. @@ -20,8 +20,8 @@ AC_INIT([netCDF], [4.7.4-development], [support-netcdf@unidata.ucar.edu], [netcd : ${CFLAGS=""} 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=4 +AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=8 +AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=0 AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development" ##### diff --git a/docs/Doxyfile.developer b/docs/Doxyfile.developer index 861067154..903df5aa9 100644 --- a/docs/Doxyfile.developer +++ b/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.4-development +PROJECT_NUMBER = 4.8.0-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 diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 8c5a91990..522d4dc9f 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -753,6 +753,7 @@ INPUT = \ @abs_top_srcdir@/docs/auth.md \ @abs_top_srcdir@/docs/notes.md \ @abs_top_srcdir@/docs/all-error-codes.md \ + @abs_top_srcdir@/docs/building-with-cmake.md \ @abs_top_srcdir@/docs/FAQ.md \ @abs_top_srcdir@/docs/known_problems.md \ @abs_top_srcdir@/docs/COPYRIGHT.md \ diff --git a/docs/mainpage.dox b/docs/mainpage.dox index c7f35abe5..bad7a76ea 100644 --- a/docs/mainpage.dox +++ b/docs/mainpage.dox @@ -18,7 +18,7 @@ You can find the documentation for netCDF-Fortran here: \section this_release Learn more about the current NetCDF-C Release - \subpage RELEASE_NOTES -- \ref getting_and_building_netcdf +- Getting and Building NetCDF \subsection nightly_status The Latest NetCDF Build Status @@ -36,7 +36,7 @@ You can find the documentation for netCDF-Fortran here: \section learn-more Learn more about using NetCDF-C - \ref sec_tut -- \ref user_guide +- The netCDF User's Guide - \ref netcdf_working_with_netcdf_files - Older Documentation, plus details regarding netcdf-fortran and netcdf-cxx. diff --git a/liblib/Makefile.am b/liblib/Makefile.am index c6cd2f000..beb37039a 100644 --- a/liblib/Makefile.am +++ b/liblib/Makefile.am @@ -18,7 +18,7 @@ lib_LTLIBRARIES = libnetcdf.la # for information regarding incrementing `-version-info`. ## -libnetcdf_la_LDFLAGS = -version-info 17:1:2 +libnetcdf_la_LDFLAGS = -version-info 18:0:0 libnetcdf_la_CPPFLAGS = ${AM_CPPFLAGS} libnetcdf_la_LIBADD =