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*.
63 lines
2.4 KiB
CMake
63 lines
2.4 KiB
CMake
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
|
|
# 2015, 2016, 2017, 2018
|
|
# University Corporation for Atmospheric Research/Unidata.
|
|
|
|
# See netcdf-c/COPYRIGHT file for more info.
|
|
SET(libdispatch_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 ddispatch.c nclog.c dstring.c dutf8.c dinternal.c doffsets.c ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c utf8proc.h utf8proc.c dpathmgr.c dutil.c drc.c dauth.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)
|
|
|
|
# Netcdf-4 only functions. Must be defined even if not used
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dgroup.c dvlen.c dcompound.c dtype.c denum.c dopaque.c dfilter.c)
|
|
|
|
IF(BUILD_V2)
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dv2i.c)
|
|
ENDIF(BUILD_V2)
|
|
|
|
IF(ENABLE_BYTERANGE)
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dhttp.c)
|
|
ENDIF(ENABLE_BYTERANGE)
|
|
|
|
IF(ENABLE_S3)
|
|
IF(ENABLE_S3_INTERNAL)
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} ncs3sdk_h5.c nch5s3comms.c nch5s3comms.h nccurl_sha256.c nccurl_sha256.h nccurl_hmac.c nccurl_hmac.h nccurl_setup.h)
|
|
ELSE()
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} ncs3sdk_aws.cpp awsincludes.h)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
IF(REGEDIT)
|
|
SET(libdispatch_SOURCES ${libdispatch_SOURCES} dreg.c)
|
|
ENDIF(REGEDIT)
|
|
|
|
add_library(dispatch OBJECT ${libdispatch_SOURCES})
|
|
IF(MPI_C_INCLUDE_PATH)
|
|
target_include_directories(dispatch PUBLIC ${MPI_C_INCLUDE_PATH})
|
|
ENDIF(MPI_C_INCLUDE_PATH)
|
|
|
|
IF(MPI_C_LIBRARIES)
|
|
target_link_libraries(dispatch PUBLIC ${MPI_C_LIBRARIES})
|
|
ENDIF(MPI_C_LIBRARIES)
|
|
|
|
IF(ENABLE_NCZARR)
|
|
target_include_directories(dispatch PUBLIC ../libnczarr)
|
|
ENDIF(ENABLE_NCZARR)
|
|
|
|
IF(ENABLE_S3)
|
|
IF(ENABLE_S3_AWS)
|
|
target_include_directories(dispatch PUBLIC ${AWSSDK_INCLUDE_DIRS})
|
|
IF(NOT MSVC)
|
|
target_compile_features(dispatch PUBLIC cxx_std_11)
|
|
ENDIF()
|
|
ELSE()
|
|
target_include_directories(dispatch PUBLIC ../libncxml)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
BUILD_BIN_TEST(ncrandom)
|
|
|
|
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
|
|
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
|
|
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
|