mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-12 15:45:21 +08:00
aeb3ac2809
re: https://github.com/Unidata/netcdf-c/issues/1836 Revert the internal filter code to simplify it. From the user's point of view, the only visible changes should be: 1. The functions that convert text to filter specs have had their signature reverted and have been moved to netcdf_aux.h 2. Some filter API functions now return NC_ENOFILTER when inquiry is made about some filter. Internally,the dispatch table has been modified to get rid of the filter_actions entry and associated complex structures. It has been replaced with inq_var_filter_ids and inq_var_filter_info entries and the dispatch table version has been bumped to 3. Corresponding NOOP and NOTNC4 functions were added to libdispatch/dnotnc4.c. Also, the filter_action entries in dispatch tables were replaced for all dispatch code bases (HDF5, DAP2, etc). This should only impact UDF users. In the process, it became clear that the form of the filters field in NC_VAR_INFO_T was format dependent, so I converted it to be of type void* and pushed its management into the various dispatch code bases. Specifically libhdf5 and libnczarr now manage the filters field in their own way. The auxilliary functions for parsing textual filter specifications were moved to netcdf_aux.h and were renamed to the following: * ncaux_h5filterspec_parse * ncaux_h5filterspec_parselist * ncaux_h5filterspec_free * ncaux_h5filter_fix8 Misc. Other Changes: 1. Document NUG/filters.md updated to reflect the changes above. 2. All the old data types (structs and enums) used by filter_actions actions were deleted. The exception is the NC_H5_Filterspec because it is needed by ncaux_h5filterspec_parselist. 3. Clientside filters were removed -- another enhancement for which no-one ever asked. 4. The ability to remove filters was itself removed. 5. Some functionality needed by nczarr was moved from libhdf5 to libsrc4 e.g. nc4_find_default_chunksizes 6. All the filterx code was removed 7. ncfilter.h and nc4filter.c no longer used Misc. Unrelated Changes: 1. The nczarr_test makefile clean was leaving some directories; so add clean-local to take care of them.
70 lines
2.5 KiB
Makefile
70 lines
2.5 KiB
Makefile
## This is a automake file, part of Unidata's netCDF package.
|
|
# Copyright 2008, see the COPYRIGHT file for more information.
|
|
|
|
# This Makefile controls the building of the dispatch layer of the
|
|
# netCDF library. The dispatch layer decides whether to call the
|
|
# netcdf-classic code, netcdf-4 code, nc3 dap code, or nc4 dap
|
|
# code. It also contains code that sit above the dispatch layer, like
|
|
# the v2 API.
|
|
|
|
# Put together AM_CPPFLAGS and AM_LDFLAGS.
|
|
include $(top_srcdir)/lib_flags.am
|
|
|
|
# This is our output, the dispatch convenience library.
|
|
noinst_LTLIBRARIES = libdispatch.la
|
|
libdispatch_la_CPPFLAGS = ${AM_CPPFLAGS}
|
|
|
|
# The source files.
|
|
libdispatch_la_SOURCES = dparallel.c dcopy.c dfile.c ddim.c datt.c \
|
|
dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c \
|
|
dvarinq.c dinternal.c ddispatch.c dutf8.c nclog.c dstring.c ncuri.c \
|
|
nclist.c ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c dauth.c \
|
|
doffsets.c dwinpath.c dutil.c dreadonly.c dnotnc4.c dnotnc3.c crc32.c \
|
|
crc32.h daux.c dinfermodel.c
|
|
|
|
# Add the utf8 codebase
|
|
libdispatch_la_SOURCES += utf8proc.c utf8proc.h
|
|
|
|
# The rc code is currently only used by libdap2 and libdap4,
|
|
# but in the future, it will be expanded to be used as the
|
|
# general .rc file for the netcdf-c library. So, always compile it.
|
|
libdispatch_la_SOURCES += drc.c
|
|
|
|
# Add functions only found in netCDF-4.
|
|
# They are always defined, even if they just return an error
|
|
libdispatch_la_SOURCES += dgroup.c dvlen.c dcompound.c dtype.c denum.c \
|
|
dopaque.c dfilter.c
|
|
|
|
# Add V2 API convenience library if needed.
|
|
if BUILD_V2
|
|
noinst_LTLIBRARIES += libnetcdf2.la
|
|
libnetcdf2_la_SOURCES = dv2i.c
|
|
libnetcdf2_la_CPPFLAGS = ${AM_CPPFLAGS} -DDLL_EXPORT
|
|
endif # BUILD_V2
|
|
|
|
if ENABLE_BYTERANGE
|
|
libdispatch_la_SOURCES += dhttp.c
|
|
endif # ENABLE_BYTERANGE
|
|
|
|
EXTRA_DIST=CMakeLists.txt ncsettings.hdr utf8proc_data.c
|
|
|
|
# Build ncsettings.c as follows:
|
|
# 1. copy ncsettings.hdr to ncsettings.c
|
|
# 2. append libnetcdf.settings to ncsettings.c after
|
|
# processing it as follows:
|
|
# 1. convert tabs and cr to blanks
|
|
# 2. convert embedded double quote (") to escaped form (\").
|
|
# 3. append newline (\n) to each line
|
|
# 4. surround each line with double quotes.
|
|
# 3. finally, add a semicolon to the end of ncsettings.c
|
|
# to complete the string constant.
|
|
|
|
ncsettings.c: $(top_srcdir)/libnetcdf.settings ncsettings.hdr
|
|
rm -f ncsettings.c
|
|
cat ncsettings.hdr > ncsettings.c
|
|
tr '\t\r' ' ' <${top_srcdir}/libnetcdf.settings | \
|
|
sed -e 's/"/\\"/g' | \
|
|
sed -e 's/\(.*\)/\"\1\\n\"/' | \
|
|
cat >> ncsettings.c
|
|
echo ';' >> ncsettings.c
|