Merge pull request #1535 from Unidata/v4.7.3-wellspring.wif

v4.7.4 Development Branch upstream from 4.7.3
Unidata · Nov 22, 2019 · fe5614e · fe5614e
2 parents af8f9ad + bef8e2d
commit fe5614e
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 19 deletions.
diff --git a/CMakeLists.txt b/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 3)
+SET(NC_VERSION_PATCH 4)
 SET(NC_VERSION_NOTE "-development")
 SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
 SET(VERSION ${netCDF_VERSION})
@@ -894,9 +894,9 @@ IF(ENABLE_TESTS)
 
   # Options for CTest-based tests, dashboards.
   SET(NC_CTEST_PROJECT_NAME "netcdf-c" CACHE STRING "Project Name for CTest-based testing purposes.")
-  SET(NC_CTEST_DROP_SITE "cdash.unidata.ucar.edu" CACHE STRING "Dashboard location for CTest-based testing purposes.")
+  SET(NC_CTEST_DROP_SITE "cdash.unidata.ucar.edu:443" CACHE STRING "Dashboard location for CTest-based testing purposes.")
   SET(NC_CTEST_DROP_LOC_PREFIX "" CACHE STRING "Prefix for Dashboard location on remote server when using CTest-based testing.")
-
+  SET(SUBMIT_URL "https://cdash.unidata.ucar.edu:443")
   FIND_PROGRAM(HOSTNAME_CMD NAMES hostname)
   IF(NOT MSVC)
     SET(HOSTNAME_ARG "-s")
@@ -912,7 +912,7 @@ IF(ENABLE_TESTS)
 
   # Create a CTestConfig file from the template.
   CONFIGURE_FILE("${netCDF_SOURCE_DIR}/CTestConfig.cmake.in"
-    "${netCDF_SOURCE_DIR}/CTestConfig.cmake"
+    "${netCDF_BINARY_DIR}/CTestConfig.cmake"
     @ONLY
     )
 
@@ -2043,6 +2043,7 @@ set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/netCDF)
 install(EXPORT netCDFTargets
   DESTINATION ${ConfigPackageLocation}
   COMPONENT headers
+  NAMESPACE netCDF::
   )
 
 include(CMakePackageConfigHelpers)
@@ -2063,6 +2064,13 @@ INSTALL(
   COMPONENT headers
   )
 
+add_library(netCDF::netcdf ALIAS netcdf)
+target_include_directories(netcdf
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
 # Create export configuration
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/netCDF/netCDFConfigVersion.cmake"

diff --git a/CTestConfig.cmake.in b/CTestConfig.cmake.in
@@ -18,7 +18,7 @@ set(CTEST_PROJECT_NAME "@NC_CTEST_PROJECT_NAME@")
 set(CTEST_NIGHTLY_START_TIME "02:00:00 EDT")
 SET(CTEST_SITE "@NC_CTEST_SITE@")
 
-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "@NC_CTEST_DROP_SITE@")
 set(CTEST_DROP_LOCATION "@NC_CTEST_DROP_LOC_PREFIX@/submit.php?project=@NC_CTEST_PROJECT_NAME@")
 set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -5,14 +5,22 @@ 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.3 - TBD
+## 4.7.4 - TBD
 
+## 4.7.3 - November 20, 2019
+
+* [Bug Fix]Fixed an issue where installs from tarballs will not properly compile in parallel environments.
+* [Bug Fix] Library was modified so that rewriting the same attribute happens without deleting the attribute, to avoid a limit on how many times this may be done in HDF5. This fix was thought to be in 4.6.2 but was not. See [https://github.com/Unidata/netcdf-c/issues/350].
+* [Enhancement] Add a dispatch version number to netcdf_meta.h and libnetcdf.settings, in case we decide to change dispatch table in future. See [https://github.com/Unidata/netcdf-c/issues/1469].
+* [Bug Fix] Now testing that endianness can only be set on atomic ints and floats. See [https://github.com/Unidata/netcdf-c/issues/1479].
+* [Bug Fix] Fix for subtle error involving var and unlimited dim of the same name, but unrelated, in netCDF-4. See [https://github.com/Unidata/netcdf-c/issues/1496].
+* [Enhancement] Update for attribute documentation. See [https://github.com/Unidata/netcdf-c/issues/1512].
 * [Bug Fix][Enhancement] Corrected assignment of anonymous (a.k.a. phony) dimensions in an HDF5 file. Now when a dataset uses multiple dimensions of the same size, netcdf assumes they are different dimensions. See [GitHub #1484](https://github.com/Unidata/netcdf-c/issues/1484) for more information.
 
 ## 4.7.2 - October 22, 2019
 
 * [Bug Fix][Enhancement] Various bug fixes and enhancements.
-* [Bug Fix][Enhancement] Corrected an issue where protected memory was being written to with some pointer slight-of-hand.  This has been in the code for a while, but appears to be caught by the compiler on OSX, under circumstances yet to be completely nailed down.  See [GitHub #1486](https://github.com/Unidata/netcdf-c/issues/1486) for more information.  
+* [Bug Fix][Enhancement] Corrected an issue where protected memory was being written to with some pointer slight-of-hand.  This has been in the code for a while, but appears to be caught by the compiler on OSX, under circumstances yet to be completely nailed down.  See [GitHub #1486](https://github.com/Unidata/netcdf-c/issues/1486) for more information.
 * [Enhancement] [Parallel IO] Added support for parallel functions in MSVC. See [Github #1492](https://github.com/Unidata/netcdf-c/pull/1492) for more information.
 * [Enhancement] Added a function for changing the ncid of an open file.  This function should only be used if you know what you are doing, and is meant to be used primarily with PIO integration. See [GitHub #1483](https://github.com/Unidata/netcdf-c/pull/1483) and [GitHub #1487](https://github.com/Unidata/netcdf-c/pull/1487) for more information.
 

diff --git 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.3-development], [support-netcdf@unidata.ucar.edu], [netcdf-c])
+AC_INIT([netCDF], [4.7.4-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.3-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=3
+AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=4
 AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development"
 
 #####

diff --git 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.3-development
+PROJECT_NUMBER         = 4.7.4-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/FAQ.md b/docs/FAQ.md
@@ -1938,8 +1938,8 @@ It depends on the library.  To specify a custom `ZLib`, for example, you would d
 
 `HDF5` is more complex, since it requires both the `hdf5` and `hdf5_hl` libraries. You would specify custom `HDF5` libraries as follows:
 
-        $ cmake [Source Directory] -DHDF5_LIB=/path/to/hdf5.lib \
-            -DHDF5_HL_LIB=/path/to/hdf5_hl.lib \
+        $ cmake [Source Directory] -DHDF5_C_LIBRARY=/path/to/hdf5.lib \
+            -DHDF5_HL_LIBRARY=/path/to/hdf5_hl.lib \
             -DHDF5_INCLUDE_DIR=/path/to/hdf5/include
 
 
@@ -1971,8 +1971,8 @@ If cmake is having problems finding the parallel `HDF5` install, you can specify
 
 
         $ cmake [Source Directory] -DENABLE_PARALLEL=ON \
-            -DHDF5_LIB=/usr/lib64/openmpi/lib/libhdf5.so \
-            -DHDF5_HL_LIB=/usr/lib64/openmpi/lib/libhdf5.hl.so \
+            -DHDF5_C_LIBRARY=/usr/lib64/openmpi/lib/libhdf5.so \
+            -DHDF5_HL_LIBRARY=/usr/lib64/openmpi/lib/libhdf5.hl.so \
             -DHDF5_INCLUDE_DIR=/usr/include/openmpi-x86_64 \
 
 You will, of course, need to use the location of the libraries specific to your development environment.

diff --git a/docs/static-pages/software.html b/docs/static-pages/software.html
@@ -290,6 +290,9 @@ <h2><a href="#freely">Freely Available Software</a></h2>
       <li>
         <a href="#WebWinds">WebWinds</a>
       </li>
+      <li>
+        <a href="#xdfv" >xdfv (A slick NetCDF/HDF4/HDF5 contents viewer with developers in mind)<A>
+      </li>
       <li>
         <a href="#xray" >xray (Python N-D labelled arrays)</a>
       </li>
@@ -2972,7 +2975,9 @@ <h2><a id="xray" name="xray">xray (Python N-D labelled arrays)</a></h2>
       href="https://github.com/xray/xray/graphs/contributors" >other
       contributors</a>.
     </p>
-
+    <h2><a id="xdfv" name="xdfv">xdfv</a></h2>
+      Xdfv is a developer-centric visualizer for NetCDF/HDF4/HDF5 data files.  The project is available from GitHub at <a href="https://github.com/gmcgarragh/xdfv"> https://github.com/gmcgarragh/xdfv</a>.
+    </p>
     <h2><a id="Zebra" name="Zebra">Zebra</a></h2>
     <a href="http://www.atd.ucar.edu/rdp/zebra.html">Zebra</a> (formerly named Zeb)
     is a system for data ingest, storage, integration and display, designed to operate

diff --git 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:0:2
+libnetcdf_la_LDFLAGS = -version-info 17:1:2
 
 libnetcdf_la_CPPFLAGS = ${AM_CPPFLAGS}
 libnetcdf_la_LIBADD =

diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in
@@ -4,6 +4,7 @@
 # General
 -------
 NetCDF Version:		@PACKAGE_VERSION@
+Dispatch Version:       @NC_DISPATCH_VERSION@
 Configured On:		@CONFIG_DATE@
 Host System:		@host_cpu@-@host_vendor@-@host_os@
 Build Directory: 	@abs_top_builddir@
@@ -39,4 +40,3 @@ JNA Support:		@HAS_JNA@
 CDF5 Support:		@HAS_CDF5@
 ERANGE Fill Support:	@HAS_ERANGE_FILL@
 Relaxed Boundary Check:	@RELAX_COORD_BOUND@
-Dispatch Version:       @NC_DISPATCH_VERSION@
diff --git a/nc_perf/Makefile.am b/nc_perf/Makefile.am
@@ -54,8 +54,8 @@ run_par_bm_test.log: tst_create_files.log
 endif # TEST_PARALLEL4
 endif # BUILD_UTILITIES
 
-EXTRA_DIST = run_par_bm_test.sh.in run_knmi_bm.sh	\
-perftest.sh run_bm_test1.sh run_bm_test2.sh \
+EXTRA_DIST = run_par_bm_test.sh.in run_knmi_bm.sh perftest.sh		\
+run_bm_test1.sh run_bm_test2.sh run_tst_chunks.sh run_bm_elena.sh	\
 CMakeLists.txt
 
 CLEANFILES = tst_*.nc bigmeta.nc bigvars.nc floats*.nc	\