support setting/inquiring per variable fill mode for nc3 files

CMakeLists.txt

@@ -25,14 +25,14 @@ set(PACKAGE "netCDF" CACHE STRING "")
 #####
 
 SET(NC_VERSION_MAJOR 4)
-SET(NC_VERSION_MINOR 4)
-SET(NC_VERSION_PATCH 2)
+SET(NC_VERSION_MINOR 5)
+SET(NC_VERSION_PATCH 1)
 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 11.4.0)
-SET(netCDF_SO_VERSION 11)
+SET(netCDF_LIB_VERSION 13)
+SET(netCDF_SO_VERSION 13)
 SET(PACKAGE_VERSION ${VERSION})
 
 # Get system configuration, Use it to determine osname, os release, cpu. These
@@ -645,7 +645,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
       SET(HDF5_C_LIBRARY hdf5)
     ENDIF()
   ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
- 
+
   # There is a missing case in the above code so default it
   IF("${HDF5_C_LIBRARY_hdf5}" STREQUAL "" )
     SET(HDF5_C_LIBRARY_hdf5 "${HDF5_C_LIBRARY}")
@@ -1272,6 +1272,11 @@ IF(SIZEOF_UINT)
   SET(HAVE_UINT TRUE)
 ENDIF(SIZEOF_UINT)
 
+CHECK_TYPE_SIZE("schar"      SIZEOF_SCHAR)
+IF(SIZEOF_SCHAR)
+  SET(HAVE_SCHAR TRUE)
+ENDIF(SIZEOF_SCHAR)
+
 CHECK_TYPE_SIZE("long"      SIZEOF_LONG)
 CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
 IF(SIZEOF_LONG_LONG)
@@ -1860,6 +1865,7 @@ SET(host_cpu "${cpu}")
 SET(host_vendor "${osname}")
 SET(host_os "${osrel}")
 SET(abs_top_builddir "${CMAKE_BINARY_DIR}")
+SET(abs_top_srcdir "${CMAKE_SOURCE_DIR}")
 
 SET(CC_VERSION "${CMAKE_C_COMPILER}")
 

RELEASE_NOTES.md

@@ -5,21 +5,31 @@ 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.4.2 - TBD
+## 4.5.0 - TBD
+
+### 4.5.0-rc2 - TBD
+
+* [Bug Fix] Addressed an issue where ncgen would not respect keyword case. See [GitHub #310](https://github.com/Unidata/netcdf-c/issues/310) for more information.
+
+### 4.5.0-rc1 - June 5, 2017
 
 * [Enhancement] DAP4 is now included. Since dap2 is the default for urls, dap4 must be specified by
 (1) using "dap4:" as the url protocol, or
 (2) appending "#protocol=dap4" to the end of the url, or
-(3) appending "#dap4" to the end of the url 
+(3) appending "#dap4" to the end of the url
 Note that dap4 is enabled by default but remote-testing is
 disbled until the testserver situation is resolved.
-* [Enhancement] The remote testing server can now be specified with the '--with-testserver" option to ./configure.
+* [Enhancement] The remote testing server can now be specified with the `--with-testserver` option to ./configure.
+* [Enhancement] Modified netCDF4 to use ASCII for NC_CHAR.  See [Github Pull request #316](https://github.com/Unidata/netcdf-c/pull/316) for more information.
+* [Bug Fix] Corrected an error with how dimsizes might be read. See [Github #410](https://github.com/unidata/netcdf-c/issues/410) for more information.
+* [Bug Fix] Corrected an issue where 'make check' would fail if 'make' or 'make all' had not run first.  See [Github #339](https://github.com/Unidata/netcdf-c/issues/339) for more information.
+* [Bug Fix] Corrected an issue on Windows with Large file tests. See [Github #385](https://github.com/Unidata/netcdf-c/issues/385]) for more information.
+* [Bug Fix] Corrected an issue with diskless file access, see [Pull Request #400](https://github.com/Unidata/netcdf-c/issues/400) and [Pull Request #403](https://github.com/Unidata/netcdf-c/issues/403) for more information.
 * [Upgrade] The bash based test scripts have been upgraded to use a common test_common.sh include file that isolates build specific information.
 * [Upgrade] The bash based test scripts have been upgraded to use a common test_common.sh include file that isolates build specific information.
 * [Refactor] the oc2 library is no longer independent of the main netcdf-c library. For example, it now uses ncuri, nclist, and ncbytes instead of its homegrown equivalents.
 * [Bug Fix] `NC_EGLOBAL` is now properly returned when attempting to set a global `_FillValue` attribute. See [GitHub #388](https://github.com/Unidata/netcdf-c/issues/388) and [GitHub #389](https://github.com/Unidata/netcdf-c/issues/389) for more information.
 * [Bug Fix] Corrected an issue where data loss would occur when `_FillValue` was mistakenly allowed to be redefined.  See [Github #390](https://github.com/Unidata/netcdf-c/issues/390), [GitHub #387](https://github.com/Unidata/netcdf-c/pull/387) for more information.
-* [Enhancement] Modified netCDF4 to use ASCII for NC_CHAR.  See [Github Pull request #316](https://github.com/Unidata/netcdf-c/pull/316) for more information.
 * [Upgrade][Bug] Corrected an issue regarding how "orphaned" DAS attributes were handled. See [GitHub #376](https://github.com/Unidata/netcdf-c/pull/376) for more information.
 * [Upgrade] Update utf8proc.[ch] to use the version now maintained by the Julia Language project (https://github.com/JuliaLang/utf8proc/blob/master/LICENSE.md).
 * [Bug] Addressed conversion problem with Windows sscanf.  This primarily affected some OPeNDAP URLs on Windows.  See [GitHub #365](https://github.com/Unidata/netcdf-c/issues/365) and [GitHub #366](https://github.com/Unidata/netcdf-c/issues/366) for more information.

cf

@@ -54,8 +54,7 @@ MALLOC_CHECK=""
 CPPFLAGS=""
 LDFLAGS=""
 
-#CFLAGS="-g -O0 $CFLAGS"
-CFLAGS="-g $CFLAGS"
+CFLAGS="-g -O0 $CFLAGS -Wno-undefined"
 
 MAKE=make
 IGNORE="test 0 = 1"

cf.cmake

@@ -1,5 +1,5 @@
 # Visual Studio
-#VS=1
+VS=1
 
 # Is netcdf-4 and/or DAP enabled?
 NC4=1

config.h.cmake.in

@@ -3,6 +3,18 @@
 
 #ifdef _MSC_VER
 
+/* Prevent an issue where there is a circular inclusion
+   of winsock.h/windows.h.  This weird state occurs with
+   libdap4 and hdf4 support. The solution comes from the
+   following URL, found after a bit of research.
+
+   Added in support of the 4.5.0-rc1.  Hello, future generations.
+
+   * https://stackoverflow.com/questions/1372480/c-redefinition-header-files-winsock2-h
+
+   */
+   #define _WINSOCKAPI_
+
    #if _MSC_VER>=1900
      #define STDC99
    #endif
@@ -49,6 +61,12 @@ are set when opening a binary file on Windows. */
 
 #cmakedefine const
 
+#ifndef _FILE_OFFSET_BITS
+#cmakedefine _FILE_OFFSET_BITS ${_FILE_OFFSET_BITS}
+#cmakedefine _LARGEFILE64_SOURCE
+#cmakedefine _LARGEFILE_SOURCE
+#endif
+
 /* Define if building universal (internal helper macro) */
 #cmakedefine AC_APPLE_UNIVERSAL_BUILD 1
 
@@ -168,6 +186,13 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have the <fcntl.h> header file. */
 #cmakedefine HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the BaseTsd.h header file. */
+#cmakedefine HAVE_BASETSD_H @HAVE_BASETSD_H@
+
+/* Define if we have filelengthi64. */
+#cmakedefine HAVE_FILE_LENGTH_I64 @HAVE_FILE_LENGTH_I64@
+
+
 /* Define to 1 if you have the `fsync' function. */
 #cmakedefine HAVE_FSYNC 1
 
@@ -204,6 +229,9 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have the <hdf5.h> header file. */
 #cmakedefine HAVE_HDF5_H 1
 
+/* Define to 1 if you have the <hdf5.h> header file. */
+#cmakedefine HAVE_HDF5_HL_H 1
+
 /* Define to 1 if the system has the type `int64'. */
 #cmakedefine HAVE_INT64 1
 
@@ -315,12 +343,18 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have the `strdup' function. */
 #cmakedefine HAVE_STRDUP 1
 
+/* Define to 1 if you have the `strndup` function. */
+#cmakedefine HAVE_STRNDUP
+
 /* Define to 1 if you have the `strerror' function. */
 #cmakedefine HAVE_STRERROR 1
 
 /* Define to 1 if you have the <strings.h> header file. */
 #cmakedefine HAVE_STRINGS_H 1
 
+/* Define to 1 if you have the <signal.h> header file. */
+#cmakedefine HAVE_SIGNAL_H 1
+
 /* Define to 1 if you have the <string.h> header file. */
 #cmakedefine HAVE_STRING_H 1
 
@@ -342,6 +376,9 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have the `strtoull' function. */
 #cmakedefine HAVE_STRTOULL 1
 
+/* Define to 1 if you have the `stroull' function. */
+#cmakedefine HAVE_STROULL 1
+
 /* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #cmakedefine HAVE_STRUCT_STAT_ST_BLKSIZE 1
 
@@ -378,6 +415,9 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #cmakedefine HAVE_SYS_WAIT_H 1
 
+/* Define to 1 if the system has the type `schar'. */
+#cmakedefine HAVE_SCHAR 1
+
 /* Define to 1 if the system has the type `uchar'. */
 #cmakedefine HAVE_UCHAR 1
 
@@ -428,6 +468,18 @@ are set when opening a binary file on Windows. */
 /* no IEEE float on this platform */
 #cmakedefine NO_IEEE_FLOAT 1
 
+#cmakedefine BUILD_V2 1
+#cmakedefine ENABLE_DOXYGEN 1
+#cmakedefine ENABLE_INTERNAL_DOCS 1
+#cmakedefine VALGRIND_TESTS 1
+#cmakedefine ENABLE_CDMREMOTE 1
+#cmakedefine USE_HDF5 1
+#cmakedefine ENABLE_FILEINFO 1
+#cmakedefine TEST_PARALLEL ${TEST_PARALLEL}
+#cmakedefine BUILD_RPC 1
+#cmakedefine USE_X_GETOPT 1
+#cmakedefine ENABLE_EXTREME_NUMBERS 1
+
 /* do not build the netCDF version 2 API */
 #cmakedefine NO_NETCDF_2 1
 
@@ -464,6 +516,9 @@ are set when opening a binary file on Windows. */
 /* The size of `longlong` as computed by sizeof. */
 #cmakedefine SIZEOF_LONGLONG @SIZEOF_LONGLONG@
 
+/* The size of `char` as computed by sizeof. */
+#cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@
+
 /* The size of `uchar` as computed by sizeof. */
 #cmakedefine SIZEOF_UCHAR @SIZEOF_UCHAR@
 
@@ -619,9 +674,6 @@ are set when opening a binary file on Windows. */
 # define _DARWIN_USE_64_BIT_INODE 1
 #endif
 
-/* Number of bits in a file offset, on hosts where this is settable. */
-#cmakedefine _FILE_OFFSET_BITS ${_FILE_OFFSET_BITS}
-
 /* Define for large files, on AIX-style hosts. */
 #cmakedefine _LARGE_FILES ${_LARGE_FILES}