Skip to content
Commits on Source (7)
Expand all Show whitespace changes
Inline Side-by-side
.gitignore
View file @ 08eabc7e
dap4_test/findtestserver4.c
ncdap_test/findtestserver.c
#####
# End ignored generated files.
#####
### 'Normal' gitignore files.
autom4te.cache
debug.txt
......
CMakeLists.txt
View file @ 08eabc7e
......@@ -25,8 +25,8 @@ set(PACKAGE "netCDF" CACHE STRING "")
#####
SET(NC_VERSION_MAJOR 4)
SET(NC_VERSION_MINOR 6)
SET(NC_VERSION_PATCH 3)
SET(NC_VERSION_MINOR 7)
SET(NC_VERSION_PATCH 0)
SET(NC_VERSION_NOTE "")
SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
SET(VERSION ${netCDF_VERSION})
......@@ -315,7 +315,7 @@ SET(CHUNK_CACHE_PREEMPTION 0.75 CACHE STRING "Default file chunk cache preemptio
SET(MAX_DEFAULT_CACHE_SIZE 67108864 CACHE STRING "Default maximum cache size.")
SET(NETCDF_LIB_NAME "" CACHE STRING "Default name of the netcdf library.")
SET(TEMP_LARGE "." CACHE STRING "Where to put large temp files if large file tests are run.")
SET(NCPROPERTIES_EXTRA "" CACHE STRNG "Specify extra pairs for _NCProperties.")
SET(NCPROPERTIES_EXTRA "" CACHE STRING "Specify extra pairs for _NCProperties.")
SET(MPIEXEC "mpiexec" CACHE STRING "Command to run MPI programs if parallel tests are run.")
IF(NOT NETCDF_LIB_NAME STREQUAL "")
......@@ -833,6 +833,17 @@ ELSE()
SET(ENABLE_DAP4 OFF)
ENDIF()
# Option to support byte-range reading of remote datasets
OPTION(ENABLE_BYTERANGE "Enable byte-range access to remote datasets.." OFF)
IF(ENABLE_BYTERANGE)
FIND_PACKAGE(CURL)
IF(NOT CURL_LIBRARY)
MESSAGE(FATAL_ERROR "Byte-range support specified, CURL libraries are not found.")
SET(ENABLE_BYTERANGE OFF BOOL)
ELSE()
SET(ENABLE_BYTERANGE ON BOOL)
ENDIF()
ENDIF()
# Check for the math library so it can be explicitly linked.
IF(NOT WIN32)
......@@ -997,9 +1008,14 @@ IF(ENABLE_PARALLEL4 AND ENABLE_NETCDF_4)
SET(STATUS_PARALLEL "ON")
configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test.sh.in"
"${netCDF_BINARY_DIR}/tmp/run_par_test.sh" @ONLY NEWLINE_STYLE LF)
#configure_file("${netCDF_SOURCE_DIR}/nc_test4/run_par_test2.sh.in"
# "${netCDF_BINARY_DIR}/tmp/run_par_test2.sh" @ONLY NEWLINE_STYLE LF)
FILE(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test.sh"
DESTINATION ${netCDF_BINARY_DIR}/nc_test4
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
#FILE(COPY "${netCDF_BINARY_DIR}/tmp/run_par_test2.sh"
# DESTINATION ${netCDF_BINARY_DIR}/nc_test4
# FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDIF()
ENDIF()
......@@ -1402,6 +1418,7 @@ CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP)
CHECK_FUNCTION_EXISTS(fileno HAVE_FILENO)
# Check to see if MAP_ANONYMOUS is defined.
CHECK_C_SOURCE_COMPILES("
......@@ -1586,6 +1603,7 @@ MACRO(print_conf_summary)
MESSAGE(STATUS "Building netCDF-4: ${ENABLE_NETCDF_4}")
MESSAGE(STATUS "Building DAP2 Support: ${ENABLE_DAP2}")
MESSAGE(STATUS "Building DAP4 Support: ${ENABLE_DAP4}")
MESSAGE(STATUS "Building Byte-range Support: ${ENABLE_BYTERANGE}")
MESSAGE(STATUS "Building Utilities: ${BUILD_UTILITIES}")
IF(CMAKE_PREFIX_PATH)
MESSAGE(STATUS "CMake Prefix Path: ${CMAKE_PREFIX_PATH}")
......@@ -1766,6 +1784,9 @@ IF(ENABLE_TESTS)
IF(USE_NETCDF4)
INCLUDE_DIRECTORIES(h5_test)
ADD_SUBDIRECTORY(nc_test4)
IF(BUILD_BENCHMARKS)
ADD_SUBDIRECTORY(nc_perf)
ENDIF()
ADD_SUBDIRECTORY(h5_test)
ENDIF()
IF(ENABLE_DAP2)
......@@ -1839,6 +1860,8 @@ SET(CC ${CMAKE_C_COMPILER})
# Process all dependency libraries and create a string
# used when parsing netcdf.pc.in
SET(NC_LIBS "")
FOREACH(_LIB ${ALL_TLL_LIBS})
GET_FILENAME_COMPONENT(_LIB_NAME ${_LIB} NAME_WE)
STRING(REGEX REPLACE "^lib" "" _NAME ${_LIB_NAME})
......@@ -1848,13 +1871,13 @@ FOREACH(_LIB ${ALL_TLL_LIBS})
ENDFOREACH()
#SET(NC_LIBS "-lnetcdf ${NC_LIBS}")
IF(NC_LIBS)
STRING(REPLACE ";" " " NC_LIBS "${NC_LIBS}")
STRING(REPLACE "-lhdf5::hdf5-shared" "-lhdf5" NC_LIBS ${NC_LIBS})
STRING(REPLACE "-lhdf5::hdf5_hl-shared" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
STRING(REPLACE "-lhdf5::hdf5-static" "-lhdf5" NC_LIBS ${NC_LIBS})
STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
ENDIF()
STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
......@@ -1935,6 +1958,7 @@ is_enabled(ENABLE_PARALLEL4 HAS_PARALLEL4)
is_enabled(ENABLE_DAP HAS_DAP)
is_enabled(ENABLE_DAP HAS_DAP2)
is_enabled(ENABLE_DAP4 HAS_DAP4)
is_enabled(ENABLE_BYTERANGE HAS_BYTERANGE)
is_enabled(ENABLE_DISKLESS HAS_DISKLESS)
is_enabled(USE_MMAP HAS_MMAP)
is_enabled(JNA HAS_JNA)
......
Makefile.am
View file @ 08eabc7e
......@@ -78,10 +78,15 @@ if ENABLE_FILTER_TESTING
PLUGIN_DIR = plugins
endif
# If benchmarks were turned on, build and run a bunch more tests.
if BUILD_BENCHMARKS
BENCHMARKS_DIR = nc_perf
endif # BUILD_BENCHMARKS
# Define Test directories
if BUILD_TESTSETS
TESTDIRS = $(V2_TEST) nc_test $(NC_TEST4) $(HDF4_TEST_DIR) \
$(NCDAP2TESTDIR) $(NCDAP4TESTDIR)
TESTDIRS = $(V2_TEST) nc_test $(NC_TEST4) $(BENCHMARKS_DIR) \
$(HDF4_TEST_DIR) $(NCDAP2TESTDIR) $(NCDAP4TESTDIR)
endif
# This is the list of subdirs for which Makefiles will be constructed
......
Makefile.in
View file @ 08eabc7e
......@@ -208,8 +208,8 @@ CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = include h5_test libdispatch libsrc libsrc4 libsrcp \
libhdf4 libhdf5 oc2 libdap2 libdap4 liblib ncgen3 ncgen ncdump \
plugins nctest nc_test nc_test4 hdf4_test ncdap_test dap4_test \
docs examples
plugins nctest nc_test nc_test4 nc_perf hdf4_test ncdap_test \
dap4_test docs examples
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libnetcdf.settings.in $(srcdir)/nc-config.in \
$(srcdir)/netcdf.pc.in $(srcdir)/postinstall.sh.in \
......@@ -302,6 +302,7 @@ ENABLE_VALGRIND_sgcheck = @ENABLE_VALGRIND_sgcheck@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAS_BYTERANGE = @HAS_BYTERANGE@
HAS_CDF5 = @HAS_CDF5@
HAS_DAP = @HAS_DAP@
HAS_DAP2 = @HAS_DAP2@
......@@ -343,6 +344,7 @@ MKDIR_P = @MKDIR_P@
MPIEXEC = @MPIEXEC@
MSVC = @MSVC@
NC_ENABLE_DOXYGEN_PDF_OUTPUT = @NC_ENABLE_DOXYGEN_PDF_OUTPUT@
NC_HAS_BYTERANGE = @NC_HAS_BYTERANGE@
NC_HAS_CDF5 = @NC_HAS_CDF5@
NC_HAS_DAP2 = @NC_HAS_DAP2@
NC_HAS_DAP4 = @NC_HAS_DAP4@
......@@ -502,9 +504,12 @@ pkgconfig_DATA = netcdf.pc
# Optionally build plugins
@ENABLE_FILTER_TESTING_TRUE@PLUGIN_DIR = plugins
# If benchmarks were turned on, build and run a bunch more tests.
@BUILD_BENCHMARKS_TRUE@BENCHMARKS_DIR = nc_perf
# Define Test directories
@BUILD_TESTSETS_TRUE@TESTDIRS = $(V2_TEST) nc_test $(NC_TEST4) $(HDF4_TEST_DIR) \
@BUILD_TESTSETS_TRUE@$(NCDAP2TESTDIR) $(NCDAP4TESTDIR)
@BUILD_TESTSETS_TRUE@TESTDIRS = $(V2_TEST) nc_test $(NC_TEST4) $(BENCHMARKS_DIR) \
@BUILD_TESTSETS_TRUE@$(HDF4_TEST_DIR) $(NCDAP2TESTDIR) $(NCDAP4TESTDIR)
# This is the list of subdirs for which Makefiles will be constructed
......
RELEASE_NOTES.md
View file @ 08eabc7e
......@@ -5,6 +5,19 @@ 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.0 - April 29, 2019
* [Enhancement] Updated behavior of `pkgconfig` and `nc-config` to allow the use of the `--static` flags, e.g. `nc-config --libs --static`, which will show information for linking against `libnetcdf` statically. See [Github #1360](https://github.com/Unidata/netcdf-c/issues/1360) and [Github #1257](https://github.com/Unidata/netcdf-c/issues/1257) for more information.
* [Enhancement] Provide byte-range reading of remote datasets. This allows
read-only access to, for example, Amazon S3 objects and also Thredds Server
datasets via the HTTPService access method.
See [GitHub #1251](https://github.com/Unidata/netcdf-c/issues/1251).
* Update the license from the home-brewed NetCDF license to the standard 3-Clause BSD License. This change does not result in any new restrictions; it is merely the adoption of a standard, well-known and well-understood license in place of the historic NetCDF license written at Unidata. This is part of a broader push by Unidata to adopt modern, standardized licensing.
## 4.6.3 - February 28, 2019
* [Bug Fix] Correctly generated `netcdf.pc` generated either by `configure` or `cmake`. If linking against a static netcdf, you would need to pass the `--static` argument to `pkg-config` in order to list all of the downstream dependencies. See [Github #1324](https://github.com/Unidata/netcdf-c/issues/1324) for more information.
......
config.h.cmake.in
View file @ 08eabc7e
......@@ -117,6 +117,9 @@ are set when opening a binary file on Windows. */
/* set this only when building a DLL under MinGW */
#cmakedefine DLL_NETCDF 1
/* if true, build byte-range Client */
#cmakedefine ENABLE_BYTERANGE 1
/* if true, enable CDF5 Support */
#cmakedefine ENABLE_CDF5 1
......@@ -196,6 +199,8 @@ are set when opening a binary file on Windows. */
/* Define if we have filelengthi64. */
#cmakedefine HAVE_FILE_LENGTH_I64 @HAVE_FILE_LENGTH_I64@
/* Define to 1 if you have the `fileno' function. */
#cmakedefine HAVE_FILENO 1
/* Define to 1 if you have the `fsync' function. */
#cmakedefine HAVE_FSYNC 1
......
config.h.in
View file @ 08eabc7e
......@@ -29,6 +29,9 @@
/* default chunk size in bytes */
#undef DEFAULT_CHUNK_SIZE
/* if true, support byte-range read of remote datasets. */
#undef ENABLE_BYTERANGE
/* if true, enable CDF5 Support */
#undef ENABLE_CDF5
......
configure
View file @ 08eabc7e
This diff is collapsed.
configure.ac
View file @ 08eabc7e
......@@ -5,15 +5,12 @@
# the COPYRIGHT file for more information.
# Ed Hartnett, Ward Fisher, Dennis Heimbigner
# Recall that ${VAR-exp} expands to $VAR if var is set (even to null),
# and to exp otherwise.
# Running autoconf on this file will trigger a warning if
# autoconf is not at least the specified version.
AC_PREREQ([2.59])
# Initialize with name, version, and support email address.
AC_INIT([netCDF], [4.6.3], [support-netcdf@unidata.ucar.edu], [netcdf-c])
AC_INIT([netCDF], [4.7.0], [support-netcdf@unidata.ucar.edu], [netcdf-c])
##
# Prefer an empty CFLAGS variable instead of the default -g -O2.
......@@ -23,8 +20,8 @@ AC_INIT([netCDF], [4.6.3], [support-netcdf@unidata.ucar.edu], [netcdf-c])
: ${CFLAGS=""}
AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4
AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=6
AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=3
AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=7
AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=0
AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE=""
#####
......@@ -250,15 +247,6 @@ AC_ARG_ENABLE([remote-fortran-bootstrap], [AS_HELP_STRING([--enable-remote-fortr
test "x$enable_remote_fortran_bootstrap" = xyes || enable_remote_fortran_bootstrap=no
AC_MSG_RESULT([$enable_remote_fortran_bootstrap])
# Does the user want to run extra example tests
AC_MSG_CHECKING([whether extra example tests should be run])
AC_ARG_ENABLE([extra-example-tests],
[AS_HELP_STRING([--enable-extra-example-tests],
[Run extra example tests; requires GNU sed. Ignored if \
netCDF-4 is not enabled.])])
test "x$enable_extra_example_tests" = xyes || enable_extra_example_tests=no
AC_MSG_RESULT($enable_extra_example_tests)
# Does the user want to run extra parallel tests when parallel netCDF-4 is built?
AC_MSG_CHECKING([whether parallel IO tests should be run])
AC_ARG_ENABLE([parallel-tests],
......@@ -369,7 +357,7 @@ fi
# --enable-dap => enable-dap4
enable_dap4=$enable_dap
# Default is now to always do the short remote tests
# Default is to do the short remote tests.
AC_MSG_CHECKING([whether dap remote testing should be enabled (default on)])
AC_ARG_ENABLE([dap-remote-tests],
[AS_HELP_STRING([--disable-dap-remote-tests],
......@@ -380,7 +368,7 @@ if test "x$enable_dap" = "xno" ; then
fi
AC_MSG_RESULT($enable_dap_remote_tests)
# Default is now to do the remote authorization tests
# Default is not to do the remote authorization tests.
AC_MSG_CHECKING([whether dap remote authorization testing should be enabled (default off)])
AC_ARG_ENABLE([dap-auth-tests],
[AS_HELP_STRING([--enable-dap-auth-tests],
......@@ -544,6 +532,9 @@ AC_ARG_ENABLE([benchmarks],
are timed. We use these tests to check netCDF performance.])])
test "x$enable_benchmarks" = xyes || enable_benchmarks=no
AC_MSG_RESULT($enable_benchmarks)
if test "x$enable_netcdf4" = xno -a "x$enable_benchmarks" = xyes; then
AC_MSG_ERROR([Can't use benchmarks if netCDF-4 is disabled.])
fi
AM_CONDITIONAL(BUILD_BENCHMARKS, [test x$enable_benchmarks = xyes])
# Does the user want to use extreme numbers in testing.
......@@ -640,15 +631,6 @@ AC_ARG_WITH([udf1-magic-number],
[UDF1_MAGIC_NUMBER=$with_udf1_magic_number])
AC_MSG_RESULT([$UDF1_MAGIC_NUMBER])
# Did the user specify a default cache preemption?
AC_MSG_CHECKING([whether a default cache preemption for HDF5 was specified])
AC_ARG_WITH([chunk-cache-preemption],
[AS_HELP_STRING([--with-chunk-cache-preemption=<float between 0 and 1 inclusive>],
[Specify default file chunk cache preemption policy for HDF5 files (a number between 0 and 1, inclusive).])],
[CHUNK_CACHE_PREEMPTION=$with_chunk_cache_preemption], [CHUNK_CACHE_PREEMPTION=0.75])
AC_MSG_RESULT([$CHUNK_CACHE_PREEMPTION])
AC_DEFINE_UNQUOTED([CHUNK_CACHE_PREEMPTION], [$CHUNK_CACHE_PREEMPTION], [default file chunk cache preemption policy.])
# According to the autoconf mailing list gurus, we must test for
# compilers unconditionally. That is, we can't skip looking for the
# fortran compilers, just because the user doesn't want fortran. This
......@@ -891,6 +873,23 @@ if test "x$enable_mmap" = xyes; then
AC_DEFINE([USE_MMAP], [1], [if true, use mmap for in-memory files])
fi
# Does the user want to allow reading of remote data via range headers?
AC_MSG_CHECKING([whether byte range support is enabled])
AC_ARG_ENABLE([byterange],
[AS_HELP_STRING([--enable-byterange],
[allow byte-range I/O])])
test "x$enable_byterange" = xyes || enable_byterange=no
AC_MSG_RESULT($enable_byterange)
# Need curl for byte ranges
if test "x$found_curl" = xno ; then
AC_MSG_ERROR([curl required for byte range support. Install curl or build without --enable-byterange.])
enable_byterange=no
fi
if test "x$enable_byterange" = xyes; then
AC_DEFINE([ENABLE_BYTERANGE], [1], [if true, support byte-range read of remote datasets.])
fi
AC_FUNC_ALLOCA
AC_CHECK_DECLS([isnan, isinf, isfinite],,,[#include <math.h>])
AC_STRUCT_ST_BLKSIZE
......@@ -999,7 +998,6 @@ if test "x$enable_netcdf_4" = xyes || test "x$enable_dap" = xyes; then
AC_SEARCH_LIBS([deflate], [zlibwapi zlibstat zlib zlib1 z], [], [
AC_MSG_ERROR([Can't find or link to the z library. Turn off netCDF-4 and \
DAP clients with --disable-netcdf-4 --disable-dap, or see config.log for errors.])])
AC_SEARCH_LIBS([SZ_Compress], [szip sz], [], [])
AC_SEARCH_LIBS([dlopen], [dl dld], [], [])
fi
......@@ -1025,11 +1023,10 @@ if test "x$enable_hdf5" = xyes; then
[AC_MSG_ERROR([Can't find or link to the hdf5 high-level. Use --disable-netcdf-4, or see config.log for errors.])])
AC_CHECK_HEADERS([hdf5.h], [], [AC_MSG_ERROR([Compiling a test with HDF5 failed. Either hdf5.h cannot be found, or config.log should be checked for other reason.])])
AC_CHECK_FUNCS([H5Z_SZIP])
# H5Pset_fapl_mpiposix and H5Pget_fapl_mpiposix have been removed since HDF5 1.8.12.
# Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead.
AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5resize_memory H5allocate_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops])
AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5resize_memory H5allocate_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops H5Z_SZIP])
# Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
if test "x$ac_cv_func_H5Pset_all_coll_metadata_ops" = xyes; then
......@@ -1044,6 +1041,13 @@ if test "x$enable_hdf5" = xyes; then
AC_MSG_CHECKING([whether parallel io is enabled in hdf5])
AC_MSG_RESULT([$hdf5_parallel])
# Check to see if we need to search for and link against szlib.
if test "x$ac_cv_func_H5Z_SZIP" = xyes; then
AC_SEARCH_LIBS([SZ_Compress], [szip sz], [],
[AC_MSG_ERROR([libhdf5 installed with szip support, but cannot find or link to the szip library.])])
fi
if test "x$hdf5_parallel" = "xno"; then
if test "x$enable_parallel_tests" = "xyes"; then
AC_MSG_ERROR([Parallel tests requested, but no parallel HDF5 installation detected.])
......@@ -1277,7 +1281,6 @@ AM_CONDITIONAL(ENABLE_CDF5, [test "x$enable_cdf5" = xyes])
AM_CONDITIONAL(ENABLE_DAP_REMOTE_TESTS, [test "x$enable_dap_remote_tests" = xyes])
AM_CONDITIONAL(ENABLE_DAP_AUTH_TESTS, [test "x$enable_dap_auth_tests" = xyes])
AM_CONDITIONAL(ENABLE_DAP_LONG_TESTS, [test "x$enable_dap_long_tests" = xyes])
AM_CONDITIONAL(EXTRA_EXAMPLE_TESTS, [test "x$enable_extra_example_tests" = xyes])
AM_CONDITIONAL(USE_SZIP, [test "x$ac_cv_func_H5Z_SZIP" = xyes])
AM_CONDITIONAL(USE_PNETCDF_DIR, [test ! "x$PNETCDFDIR" = x])
AM_CONDITIONAL(USE_LOGGING, [test "x$enable_logging" = xyes])
......@@ -1294,6 +1297,7 @@ AM_CONDITIONAL(BUILD_MMAP, [test x$enable_mmap = xyes])
AM_CONDITIONAL(BUILD_DOCS, [test x$enable_doxygen = xyes])
AM_CONDITIONAL(SHOW_DOXYGEN_TAG_LIST, [test x$enable_doxygen_tasks = xyes])
AM_CONDITIONAL(ENABLE_METADATA_PERF, [test x$enable_metadata_perf = xyes])
AM_CONDITIONAL(ENABLE_BYTERANGE, [test "x$enable_byterange" = xyes])
# If the machine doesn't have a long long, and we want netCDF-4, then
# we've got problems!
......@@ -1381,14 +1385,6 @@ if test "x$enable_jna" = xyes ; then
AC_DEFINE([JNA], [1], [if true, include JNA bug fix])
fi
# Control large metadata performance test
AC_MSG_CHECKING([whether large metadata performance testing should be run])
AC_ARG_ENABLE([metadata-perf],
[AS_HELP_STRING([--enable-metadata-perf],
[Test performance of nc_create and nc_open on large metadata])])
test "x$enable_metadata_perf" = xyes || enable_metadata_perf=no
AC_MSG_RESULT($enable_metadata_perf)
# Control filter test/example
AC_MSG_CHECKING([whether filter testing should be run])
AC_ARG_ENABLE([filter-testing],
......@@ -1427,7 +1423,7 @@ AC_SUBST(HAS_MMAP,[$enable_mmap])
AC_SUBST(HAS_JNA,[$enable_jna])
AC_SUBST(RELAX_COORD_BOUND,[$enable_zero_length_coord_bound])
AC_SUBST(HAS_ERANGE_FILL,[$enable_erange_fill])
AC_SUBST(HAS_BYTERANGE,[$enable_byterange])
# Include some specifics for netcdf on windows.
#AH_VERBATIM([_WIN32_STRICMP],
......@@ -1496,36 +1492,26 @@ AX_SET_META([NC_HAS_PARALLEL4],[$enable_parallel4],[yes])
AX_SET_META([NC_HAS_CDF5],[$enable_cdf5],[yes])
AX_SET_META([NC_HAS_ERANGE_FILL], [$enable_erange_fill],[yes])
AX_SET_META([NC_RELAX_COORD_BOUND], [$enable_zero_length_coord_bound],[yes])
AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes])
#####
# End netcdf_meta.h definitions.
#####
# Automake says that this is always run in top_builddir
# and that srcdir is defined (== top_srcdir)
abs_top_builddir=`pwd`
cd $srcdir
abs_top_srcdir=`pwd`
cd $abs_top_builddir
# test_common.sh setup
AC_CONFIG_FILES(test_common.sh:test_common.in)
#rm -f ${abs_top_builddir}/test_common.sh
#sed -e "s|@TOPSRCDIR@|${abs_top_srcdir}|" -e "s|@TOPBUILDDIR@|${abs_top_builddir}|" <${abs_top_srcdir}/test_common.in >${abs_top_builddir}/test_common.sh
# nc_test4/findplugin.sh setup
# This would be true for a cmake build.
AC_SUBST([ISCMAKE], [])
# This would be true for a visual studio build.
AC_SUBST([MSVC], [])
AC_MSG_NOTICE([generating header files and makefiles])
AC_CONFIG_FILES(test_common.sh:test_common.in)
AC_CONFIG_FILES(nc_test4/findplugin.sh:nc_test4/findplugin.in)
AC_CONFIG_FILES(examples/C/findplugin.sh:nc_test4/findplugin.in)
# DAP 2/4 findtestserver[4].c setup
AC_CONFIG_FILES(ncdap_test/findtestserver.c:ncdap_test/findtestserver.c.in)
AC_CONFIG_FILES(dap4_test/findtestserver4.c:ncdap_test/findtestserver.c.in)
#####
# End netcdf_meta.h definitions.
#####
AC_MSG_NOTICE([generating header files and makefiles])
AC_CONFIG_FILES([nc_test4/run_par_test.sh], [chmod ugo+x nc_test4/run_par_test.sh])
AC_CONFIG_FILES([nc_test4/run_par_bm_test.sh], [chmod ugo+x nc_test4/run_par_bm_test.sh])
AC_CONFIG_FILES([nc_perf/run_par_bm_test.sh], [chmod ugo+x nc_perf/run_par_bm_test.sh])
AC_CONFIG_FILES([examples/C/run_par_test.sh], [chmod ugo+x examples/C/run_par_test.sh])
AC_CONFIG_FILES([nc-config], [chmod 755 nc-config])
AC_CONFIG_FILES([Makefile
netcdf.pc
......@@ -1557,6 +1543,7 @@ AC_CONFIG_FILES([Makefile
docs/images/Makefile
nctest/Makefile
nc_test4/Makefile
nc_perf/Makefile
nc_test/Makefile
ncdap_test/Makefile
ncdap_test/testdata3/Makefile
......
dap4_test/Makefile.in
View file @ 08eabc7e
......@@ -481,6 +481,7 @@ ENABLE_VALGRIND_sgcheck = @ENABLE_VALGRIND_sgcheck@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAS_BYTERANGE = @HAS_BYTERANGE@
HAS_CDF5 = @HAS_CDF5@
HAS_DAP = @HAS_DAP@
HAS_DAP2 = @HAS_DAP2@
......@@ -522,6 +523,7 @@ MKDIR_P = @MKDIR_P@
MPIEXEC = @MPIEXEC@
MSVC = @MSVC@
NC_ENABLE_DOXYGEN_PDF_OUTPUT = @NC_ENABLE_DOXYGEN_PDF_OUTPUT@
NC_HAS_BYTERANGE = @NC_HAS_BYTERANGE@
NC_HAS_CDF5 = @NC_HAS_CDF5@
NC_HAS_DAP2 = @NC_HAS_DAP2@
NC_HAS_DAP4 = @NC_HAS_DAP4@
......
debian/changelog
View file @ 08eabc7e
netcdf (1:4.7.0-1~exp1) experimental; urgency=medium
* New upstream release.
* Update copyright file, changes:
- Update copyright years for Unidata
- Add license & copyright for H5FDhttp sources
* Drop patches included upstream, refresh remaining patches.
* Update symbols for 4.7.0.
-- Bas Couwenberg <sebastic@debian.org> Tue, 30 Apr 2019 07:08:56 +0200
netcdf (1:4.6.3-1~exp1) experimental; urgency=medium
* New upstream release.
......
debian/copyright
View file @ 08eabc7e
......@@ -4,7 +4,7 @@ Upstream-Contact: University Corporation for Atmospheric Research/Unidata
Source: https://github.com/Unidata/netcdf-c/releases
Files: *
Copyright: 1988-2018, University Corporation for Atmospheric Research/Unidata
Copyright: 1988-2019, University Corporation for Atmospheric Research/Unidata
2003, 2014, Northwestern University and Argonne National Laboratory
2009, OPeNDAP, Inc
License: BSD-3-Clause
......@@ -76,7 +76,9 @@ Files: libsrc/pstdint.h
Copyright: 2005-2007, Paul Hsieh
License: BSD-3-Clause
Files: libhdf5/nc4mem.c
Files: libhdf5/H5FDhttp.c
libhdf5/H5FDhttp.h
libhdf5/nc4mem.c
libhdf5/nc4memcb.c
Copyright: The HDF Group
the Board of Trustees of the University of Illinois
......
debian/libnetcdf15.symbols
View file @ 08eabc7e
......@@ -54,7 +54,7 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
NC4_HDF5_set_var_chunk_cache@Base 4.6.2.1
NC4__enddef@Base 4.1.3
NC4_abort@Base 4.1.3
NC4_buildpropinfo@Base 4.4.1.1
NC4_clear_provenance@Base 4.7.0
NC4_close@Base 4.1.3
NC4_create@Base 4.1.3
NC4_create_image_file@Base 4.6.2
......@@ -73,9 +73,7 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
NC4_def_vlen@Base 4.1.3
NC4_extract_file_image@Base 4.6.2
NC4_finalize@Base 4.4.0
NC4_free_provenance@Base 4.6.2
NC4_get_att@Base 4.1.3
NC4_get_provenance@Base 4.6.2
NC4_get_var_chunk_cache@Base 4.1.3
NC4_get_vara@Base 4.1.3
NC4_get_vars@Base 4.6.2
......@@ -118,6 +116,7 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
NC4_insert_compound@Base 4.1.3
NC4_insert_enum@Base 4.1.3
NC4_isnetcdf4@Base 4.4.1
NC4_new_provenance@Base 4.7.0
NC4_open@Base 4.1.3
NC4_open_image_file@Base 4.6.2
NC4_provenance_finalize@Base 4.6.2
......@@ -125,17 +124,16 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
NC4_put_vara@Base 4.1.3
NC4_put_vars@Base 4.6.2
NC4_put_vlen_element@Base 4.1.3
NC4_read_ncproperties@Base 4.6.2
NC4_read_provenance@Base 4.7.0
NC4_redef@Base 4.1.3
NC4_rename_dim@Base 4.1.3
NC4_rename_grp@Base 4.3.3
NC4_rename_var@Base 4.1.3
NC4_set_fill@Base 4.1.3
NC4_set_provenance@Base 4.6.2
NC4_show_metadata@Base 4.1.3
NC4_sync@Base 4.1.3
NC4_var_par_access@Base 4.1.3
NC4_write_ncproperties@Base 4.6.2
NC4_write_provenance@Base 4.7.0
NCD2_close@Base 4.3.3
NCD2_def_compound@Base 4.4.1
NCD2_def_dim@Base 4.4.1
......@@ -362,6 +360,7 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
NC_hashmapnew@Base 4.6.1
NC_hashmapremove@Base 4.6.1
NC_hashmapsetdata@Base 4.6.1
NC_infermodel@Base 4.7.0
NC_initialized@Base 4.4.0
NC_inq_recvar@Base 4.4.0
NC_inq_var_all@Base 4.4.1
......@@ -375,13 +374,13 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
NC_parseproxy@Base 4.6.0
NC_rcclear@Base 4.6.0
NC_rcfile_insert@Base 4.6.2
NC_rcfile_ith@Base 4.7.0
NC_rcfile_length@Base 4.7.0
NC_rcload@Base 4.6.0
NC_rclookup@Base 4.6.0
NC_readfile@Base 4.6.0
NC_set_rcfile@Base 4.6.0
NC_sync@Base 3.6.1
NC_testurl@Base 4.1.3
NC_urlmodel@Base 4.1.3
NC_var_shape@Base 3.6.1
NC_writefile@Base 4.6.2
NCpathcvt@Base 4.5.0
......@@ -608,7 +607,6 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
function@Base 4.1.3
getalldims@Base 4.3.3
getlimitnumber@Base 4.1.3
globalpropinfo@Base 4.4.1
hash_fast@Base 4.1.3
indexer@Base 4.1.3
indexpath@Base 4.1.3
......@@ -1150,7 +1148,6 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
nclogtextn@Base 4.1.3
ncopen@Base 3.6.1
ncopts@Base 3.6.1
ncprintpropinfo@Base 4.6.2
ncprintprovenance@Base 4.6.2
ncrc_globalstate@Base 4.6.0
ncrecget@Base 3.6.1
......@@ -1170,10 +1167,12 @@ libnetcdf.so.15 #PACKAGE# #MINVER#
ncuridecodepartial@Base 4.5.0
ncuriencodeonly@Base 4.5.0
ncuriencodeuserpwd@Base 4.5.0
ncurifragmentparams@Base 4.7.0
ncurifree@Base 4.3.3
ncurilookup@Base 4.3.3
ncuriparse@Base 4.3.3
ncuriquerylookup@Base 4.5.0
ncuriqueryparams@Base 4.7.0
ncurisetprotocol@Base 4.5.0
ncurisetquery@Base 4.5.0
ncvardef@Base 3.6.1
......
debian/patches/NDEBUG-version-of-macro-NC_CHECK.patch deleted 100644 → 0
View file @ d272781d
Description: provide NDEBUG version of macro NC_CHECK which does not use code file name
Author: Ed Hartnett <edwardjameshartnett@gmail.com>
Origin: https://github.com/Unidata/netcdf-c/pull/1326/commits/8904c5cbc362d38513946136878857184ccdbc27
Bug: https://github.com/Unidata/netcdf-c/issues/1323
---
ncdump/utils.h | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/ncdump/utils.h
+++ b/ncdump/utils.h
@@ -63,7 +63,15 @@ extern char *progname; /* for error mes
extern "C" {
#endif
+/* For NDEBUG builds, provide a version of NC_CHECK that does not
+ * include a file name. Including a file name causes heartache for the
+ * debian package builders. They already use NDEBUG to turn off the
+ * file names in asserts. */
+#ifdef NDEBUG
+#define NC_CHECK(fncall) {int ncstat=fncall;if(ncstat!=NC_NOERR)check(ncstat,"",__LINE__);}
+#else
#define NC_CHECK(fncall) {int ncstat=fncall;if(ncstat!=NC_NOERR)check(ncstat,__FILE__,__LINE__);}
+#endif /* NDEBUG */
/* Print error message to stderr and exit */
extern void error ( const char *fmt, ... );
debian/patches/Remove-all-references-to-__FILE__-in-ncgen.patch deleted 100644 → 0
View file @ d272781d
Description: Remove all references to __FILE__ in ncgen
Replace the uses of the __FILE__ macro in ncgen with the
constant string "ncgen" in order to keep external package
builders (like Debian) happy.
.
Note that __FILE__ will still appear in ncgen generated C code
files, but this should be ok since it is not part of the distro
per-se.
Author: Dennis Heimbigner <dmh@ucar.edu>
Origin: https://github.com/Unidata/netcdf-c/pull/1327/commits/ad3e3bd48e9af4f0f293b71cff1fec787e0b6bc3
Bug: https://github.com/Unidata/netcdf-c/issues/1323
--- a/ncgen/genbin.c
+++ b/ncgen/genbin.c
@@ -60,7 +60,7 @@ genbin_netcdf(void)
#endif
stat = nc_create(filename, cmode_modifier, &ncid);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
/* ncid created above is also root group*/
rootgroup->nc_id = ncid;
@@ -72,7 +72,7 @@ genbin_netcdf(void)
Symbol* gsym = (Symbol*)listget(grpdefs,igrp);
if(gsym == rootgroup) continue; /* ignore root group*/
stat = nc_def_grp(gsym->container->nc_id,gsym->name,&gsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#endif
@@ -95,7 +95,7 @@ genbin_netcdf(void)
dsym->name,
(dsym->dim.isunlimited?NC_UNLIMITED:dsym->dim.declsize),
&dsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
}
@@ -122,7 +122,7 @@ genbin_netcdf(void)
NULL,
&vsym->nc_id);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
}
@@ -154,12 +154,12 @@ genbin_netcdf(void)
if (nofill_flag) {
stat = nc_set_fill(rootgroup->nc_id, NC_NOFILL, 0);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
/* leave define mode */
stat = nc_enddef(rootgroup->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
if(!header_only) {
/* Load values into those variables with defined data */
@@ -189,7 +189,7 @@ genbin_defineglobalspecials(void)
/* Watch out, this is a global Attribute */
format = kind_string(/*Main.*/format_flag);
stat = nc_put_att_text(rootgroup->nc_id,NC_GLOBAL,"_Format",strlen(format),format);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#endif /*0*/
@@ -206,13 +206,13 @@ genbin_definespecialattributes(Symbol* v
derror("NC_CHUNKED requested, but no chunksizes specified");
stat = nc_def_var_chunking(var->container->nc_id, var->nc_id, NC_CHUNKED, special->_ChunkSizes);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _FLETCHER32_FLAG) {
stat = nc_def_var_fletcher32(var->container->nc_id,
var->nc_id,
special->_Fletcher32);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & (_DEFLATE_FLAG | _SHUFFLE_FLAG)) {
stat = nc_def_var_deflate(var->container->nc_id,
@@ -221,7 +221,7 @@ genbin_definespecialattributes(Symbol* v
(special->_DeflateLevel >= 0?1:0),
(special->_DeflateLevel >= 0?special->_DeflateLevel
:0));
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _ENDIAN_FLAG) {
stat = nc_def_var_endian(var->container->nc_id,
@@ -229,14 +229,14 @@ genbin_definespecialattributes(Symbol* v
(special->_Endianness == NC_ENDIAN_LITTLE?
NC_ENDIAN_LITTLE
:NC_ENDIAN_BIG));
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _NOFILL_FLAG) {
stat = nc_def_var_fill(var->container->nc_id,
var->nc_id,
(special->_Fill?NC_FILL:NC_NOFILL),
NULL);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
if(special->flags & _FILTER_FLAG) {
/* Special check for alternate way to specify _Deflate */
@@ -263,7 +263,7 @@ genbin_definespecialattributes(Symbol* v
special->_FilterParams
);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
return stat;
}
@@ -275,7 +275,7 @@ genbin_close(void)
{
int stat;
stat = nc_close(rootgroup->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#ifdef USE_NETCDF4
@@ -296,7 +296,7 @@ genbin_deftype(Symbol* tsym)
tsym->typ.size,
tsym->name,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
break;
case NC_ENUM:
{
@@ -305,7 +305,7 @@ genbin_deftype(Symbol* tsym)
tsym->typ.basetype->nc_id,
tsym->name,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
datum = bbNew();
for(i=0;i<listlength(tsym->subnodes);i++) {
Symbol* econst = (Symbol*)listget(tsym->subnodes,i);
@@ -317,7 +317,7 @@ genbin_deftype(Symbol* tsym)
tsym->nc_id,
econst->name,
bbContents(datum));
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
bbFree(datum);
}
@@ -327,14 +327,14 @@ genbin_deftype(Symbol* tsym)
tsym->name,
tsym->typ.basetype->nc_id,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
break;
case NC_COMPOUND:
stat = nc_def_compound(tsym->container->nc_id,
tsym->typ.size,
tsym->name,
&tsym->nc_id);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
for(i=0;i<listlength(tsym->subnodes);i++) {
Symbol* efield = (Symbol*)listget(tsym->subnodes,i);
ASSERT(efield->subclass == NC_FIELD);
@@ -362,7 +362,7 @@ genbin_deftype(Symbol* tsym)
efield->typ.dimset.ndims,
dimsizes);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
break;
default: panic("definectype: unexpected type subclass");
@@ -448,11 +448,11 @@ genbin_writevar(Generator* generator, Sy
} else {
stat = nc_put_vara(vsym->container->nc_id, vsym->nc_id, start, count, data);
}
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
#if 0
/* Reclaim the data */
stat = ncaux_reclaim_data(vsym->container->nc_id, vsym->typ.basetype->nc_id, data, nelems);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
bbClear(memory); /* reclaim top-level memory */
#endif
return stat;
@@ -481,7 +481,7 @@ genbin_writeattr(Generator* generator, S
case NC_BYTE: {
signed char* data = (signed char*)bbContents(databuf);
stat = nc_put_att_schar(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_CHAR: {
char* data = (char*)bbContents(databuf);
@@ -495,27 +495,27 @@ genbin_writeattr(Generator* generator, S
slen++;
}
stat = nc_put_att_text(grpid,varid,asym->name,slen,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_SHORT: {
short* data = (short*)bbContents(databuf);
stat = nc_put_att_short(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_INT: {
int* data = (int*)bbContents(databuf);
stat = nc_put_att_int(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_FLOAT: {
float* data = (float*)bbContents(databuf);
stat = nc_put_att_float(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_DOUBLE: {
double* data = (double*)bbContents(databuf);
stat = nc_put_att_double(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_STRING: {
const char** data;
@@ -527,27 +527,27 @@ genbin_writeattr(Generator* generator, S
case NC_UBYTE: {
unsigned char* data = (unsigned char*)bbContents(databuf);
stat = nc_put_att_uchar(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_USHORT: {
unsigned short* data = (unsigned short*)bbContents(databuf);
stat = nc_put_att_ushort(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_UINT: {
unsigned int* data = (unsigned int*)bbContents(databuf);
stat = nc_put_att_uint(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
case NC_INT64: {
long long* data = (long long*)bbContents(databuf);
stat = nc_put_att_longlong(grpid,varid,asym->name,typid,len,data);
- check_err2(stat,asym->lineno,__LINE__,__FILE__);
+ check_err2(stat,asym->lineno,__LINE__,"ncgen");
} break;
case NC_UINT64: {
unsigned long long* data = (unsigned long long*)bbContents(databuf);
stat = nc_put_att_ulonglong(grpid,varid,asym->name,typid,len,data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
} break;
default: PANIC1("genbin_defineattr: unexpected basetype: %d",basetype->typ.typecode);
}
@@ -556,13 +556,13 @@ genbin_writeattr(Generator* generator, S
data = (const char*)bbContents(databuf);
stat = nc_put_att(grpid,varid,asym->name,typid,
len,(void*)data);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
#ifdef GENDEBUG
{
char out[4096];
memset(out,0x77,sizeof(out));
stat = nc_get_att(grpid,varid,asym->name,&out);
- check_err(stat,__LINE__,__FILE__);
+ check_err(stat,__LINE__,"ncgen");
}
#endif
}
--- a/ncgen/nc_iter.c
+++ b/ncgen/nc_iter.c
@@ -14,7 +14,7 @@ It has diverged slightly over time.
#include "nc_iter.h"
-#define CHECK(stat,f) if(stat != NC_NOERR) {check(stat,#f,__FILE__,__LINE__);} else {}
+#define CHECK(stat,f) if(stat != NC_NOERR) {check(stat,#f,"ncgen",__LINE__);} else {}
/* forward declarations */
static int nc_blkio_init(size_t bufsize, size_t value_size, int rank,
debian/patches/hdf5-library-path.patch
View file @ 08eabc7e
......@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1836,6 +1836,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
@@ -1857,6 +1857,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
SET(CC ${CMAKE_C_COMPILER})
......@@ -35,9 +35,9 @@ Forwarded: not-needed
-libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @NC_LIBS@"
+cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @HDF5_INCS@"
+libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @HDF5_LIBS@ @NC_LIBS@"
libsprivate="@LIBS@"
HAS_STATIC=""
has_dap2="@ENABLE_DAP2@"
if [ -z $has_dap2 -o "$has_dap2" = "OFF" ]; then
--- a/netcdf.pc.in
+++ b/netcdf.pc.in
@@ -9,5 +9,5 @@ Description: NetCDF Client Library for C
......
debian/patches/series
View file @ 08eabc7e
......@@ -3,5 +3,3 @@ privacy-breach-logo.patch
hdf5-library-path.patch
tst_fileinfo-link-hdf5.patch
reproducible-settings.patch
NDEBUG-version-of-macro-NC_CHECK.patch
Remove-all-references-to-__FILE__-in-ncgen.patch
docs/CMakeLists.txt
View file @ 08eabc7e
......@@ -91,6 +91,7 @@ install-fortran.md all-error-codes.md credits.md auth.md
obsolete/fan_utils.html bestpractices.md filters.md indexing.md
inmemory.md DAP2.dox attribute_conventions.md FAQ.md
file_format_specifications.md known_problems.md
COPYRIGHT.dox user_defined_formats.md DAP4.md DAP4.dox)
COPYRIGHT.dox user_defined_formats.md DAP4.md DAP4.dox
testserver.dox byterange.dox)
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
docs/DAP4.dox
View file @ 08eabc7e
......@@ -37,13 +37,13 @@ file name normally used is replaced with a URL with a specific
format. The URL is composed of three parts.
- URL - this is a standard form URL with specific markers to indicate that
it refers to a DAP4 encoded dataset. The markers are of the form
"dap4", "protocol=dap4", or "/thredds/dap4". The following
"dap4", "mode=dap4", or "/thredds/dap4". The following
examples show how they are specified. Note that the "/thredds/dap4"
case will only work when accessing a Thredds-based server.
+ [dap4]http://remotetest.unidata.ucar.edu/d4ts/test.01
+ [protocol=dap4]http://remotetest.unidata.ucar.edu/d4ts/test.01
+ [mode=dap4]http://remotetest.unidata.ucar.edu/d4ts/test.01
+ http://remotetest.unidata.ucar.edu/d4ts/test.01#dap4
+ http://remotetest.unidata.ucar.edu/d4ts/test.01#protocol=dap4
+ http://remotetest.unidata.ucar.edu/d4ts/test.01#mode=dap4
+ http://thredds.ucar.edu/thredds/dap4/...
- Constraints - these are suffixed to the URL and take the form
......
docs/Doxyfile.developer
View file @ 08eabc7e
......@@ -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.6.3
PROJECT_NUMBER = 4.7.0
# 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
......