mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-06 15:34:44 +08:00
49737888ca
## Improvements to S3 Documentation * Create a new document *quickstart_paths.md* that give a summary of the legal path formats used by netcdf-c. This includes both file paths and URL paths. * Modify *nczarr.md* to remove most of the S3 related text. * Move the S3 text from *nczarr.md* to a new document *cloud.md*. * Add some S3-related text to the *byterange.md* document. Hopefully, this will make it easier for users to find the information they want. ## Rebuild NCZarr Testing In order to avoid problems with running make check in parallel, two changes were made: 1. The *nczarr_test* test system was rebuilt. Now, for each test. any generated files are kept in a test-specific directory, isolated from all other test executions. 2. Similarly, since the S3 test bucket is shared, any generated S3 objects are isolated using a test-specific key path. ## Other S3 Related Changes * Add code to ensure that files created on S3 are reclaimed at end of testing. * Used the bash "trap" command to ensure S3 cleanup even if the test fails. * Cleanup the S3 related configure.ac flag set since S3 is used in several places. So now one should use the option *--enable-s3* instead of *--enable-nczarr-s3*, although the latter is still kept as a deprecated alias for the former. * Get some of the github actions yml to work with S3; required fixing various test scripts adding a secret to access the Unidata S3 bucket. * Cleanup S3 portion of libnetcdf.settings.in and netcdf_meta.h.in and test_common.in. * Merge partial S3 support into dhttp.c. * Create an experimental s3 access library especially for use with Windows. It is enabled by using the options *--enable-s3-internal* (automake) or *-DENABLE_S3_INTERNAL=ON* (CMake). Also add a unit-test for it. * Move some definitions from ncrc.h to ncs3sdk.h ## Other Changes * Provide a default implementation of strlcpy and move this and similar defaults into *dmissing.c*.
105 lines
3.6 KiB
Makefile
105 lines
3.6 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 = 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 \
|
|
dpathmgr.c dutil.c dreadonly.c dnotnc4.c dnotnc3.c dinfermodel.c \
|
|
daux.c dinstance.c dcrc32.c dcrc32.h dcrc64.c ncexhash.c ncxcache.c \
|
|
ncjson.c ds3util.c dparallel.c dmissing.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
|
|
|
|
if ENABLE_S3
|
|
if ENABLE_S3_INTERNAL
|
|
# Renamed to avoid conflicts with the HDF5 files
|
|
libdispatch_la_SOURCES += ncs3sdk_h5.c nch5s3comms.c nch5s3comms.h nccurl_setup.h \
|
|
nccurl_sha256.c nccurl_sha256.h nccurl_hmac.c nccurl_hmac.h
|
|
AM_CPPFLAGS += -I$(top_srcdir)/libncxml
|
|
libdispatch_la_CPPFLAGS += ${AM_CPPFLAGS}
|
|
else
|
|
libdispatch_la_SOURCES += ncs3sdk_aws.cpp awsincludes.h
|
|
AM_CXXFLAGS = -std=c++11
|
|
endif
|
|
endif
|
|
|
|
if REGEDIT
|
|
libdispatch_la_SOURCES += dreg.c
|
|
endif
|
|
|
|
# Support generation of 32-bit unsigned int random numbers
|
|
noinst_PROGRAMS = ncrandom
|
|
ncrandom_SOURCES = ncrandom.c
|
|
|
|
EXTRA_DIST = CMakeLists.txt ncsettings.hdr utf8proc_data.c XGetopt.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
|
|
|
|
# Show what is needed to insert a new version of ezxml
|
|
# primary fix: The original ezxml.[ch] uses '//' comments;
|
|
# unpack and replace with '/*..*/'
|
|
|
|
REPO=https://downloads.sourceforge.net/project/ezxml/
|
|
EZXML=ezxml-0.8.6.tar.gz
|
|
ezxml::
|
|
rm -fr ./ezxml ./ezxml.[ch] ./license.txt
|
|
tar -zxf ./${EZXML}
|
|
sed -e 's|//\(.*\)|/*\1*/|' <ezxml/ezxml.c >./ezxml.c
|
|
sed -e 's|//\(.*\)|/*\1*/|' <ezxml/ezxml.h >./ezxml.h
|
|
cp ezxml/license.txt .
|