Commit Graph

10450 Commits

Author SHA1 Message Date
Ward Fisher
c3ca3d3001 Force cache of NETCDF_ENABLE_NCZARR_ZIP when zip development package isn't found. 2024-06-27 16:21:29 -06:00
Ward Fisher
9fd0c5b66d Correct typo in message. 2024-06-27 16:16:37 -06:00
Ward Fisher
295096bacb Correct an issue where zip development files may not be immediately available. 2024-06-27 16:15:33 -06:00
Ward Fisher
b1d5e1fad3 Fix scope of variable to report standard filters in cmake-based builds. Also, fix syntax for a test script. 2024-06-27 15:50:16 -06:00
Ward Fisher
99814c5170 Merge branch 'main' into fix-cmake-summary.wif 2024-06-27 14:51:24 -06:00
Ward Fisher
e3feef81f4
Merge pull request #2941 from gsjaardema/patch-59
Fix ordering in CMakeLists.txt
2024-06-27 14:51:00 -06:00
Ward Fisher
fd96b5f8a6 Merge branch 'main' into fix-cmake-summary.wif 2024-06-27 14:48:53 -06:00
Ward Fisher
911c91975a
Merge pull request #2942 from gsjaardema/patch-60
Different method for checking HDF5 version requirement
2024-06-27 14:43:01 -06:00
Ward Fisher
5461ec6724
Merge pull request #2943 from gsjaardema/patch-61
Clean up some inconsistencies in filter documentation
2024-06-27 14:42:29 -06:00
Greg Sjaardema
76555eb744
Clean up some inconsistencies
There were several HDF5_PLUGIN_PATH that did not have the underscore escaped.  A few other symbols with similar issues.

Fixed some code blocks that appeared broken on my markdown viewer... Not sure if that is the case in general.

There was a HDF5_PLUGIN_DIR referenced near the bottom.  I think it was supposed to be _PATH, but could be wrong since there are multiple _DIR and _PATH througout the code and scripts...
2024-06-27 11:43:32 -06:00
Greg Sjaardema
abe4d0107e
Different method for checking HDF5 version requirement
This method works for me when I have a local HDF5 build; the previous method seems to have issues comparing version numbers...
2024-06-26 15:57:40 -06:00
Greg Sjaardema
777e6d025d
Fix ordering in CMakeLists.txt
The configuration of the `nc-config` file uses some symbols that were not defined until later in the file.  This caused the quantize and zstd support lines to be incorrect.
2024-06-26 15:35:47 -06:00
Ward Fisher
bfee002d77
Merge pull request #2940 from DennisHeimbigner/zwarn.dmh
Fix some warnings in cmake
2024-06-26 15:16:40 -06:00
Dennis Heimbigner
7d966b4bfe Fix some warning in cmake
re: Issue https://github.com/Unidata/netcdf-c/issues/2939

The problem managing inter-dependent options.
I was looking for certain cases of the form, where x and y are options.
````
if( not x and y)
message(warning "not x => not y)
endif
````
However in a couple of cases (including the referenced Issue), I was only testing this:
````
if( not x)
message(warning "not x => not y)
endif
````

Fix is to correct the tests.
2024-06-26 12:42:25 -06:00
Dennis Heimbigner
06d2fe5b13 # Addendum
As suggested by Ward, I ensured that this PR supports
read backward compatibility with old key format.
This addition also adds a test case for this.

## Misc. Other Changes
* Remove some unused code
* Cleanup json error handling
* Fix some more unsigned/signed conversions warning
2024-06-25 17:13:02 -06:00
Ward Fisher
787ea1f438 Merge remote-tracking branch 'upstream/main' into DAOS_sync 2024-06-25 15:24:04 -06:00
DWesl
aa4cdf8d2c Merge upstream into patch-4 2024-06-22 11:11:33 -04:00
Dennis Heimbigner
d177400602 Update RELEASE_NOTES 2024-06-19 18:42:41 -06:00
Dennis Heimbigner
076da97aa4 Convert NCzarr meta-data to use only Zarr attributes
As discussed in a netcdf meeting, convert NCZarr V2 to store all netcdf-4 specific info as attributes. This improves interoperability with other Zarr implementations by no longer using non-standard keys.

## Other Changes
* Remove support for older NCZarr formats.
* Update anonymous dimension naming
* Begin the process of fixing the -Wconversion and -Wsign-compare warnings in libnczarr, nczarr_test, and v3_nczarr_test.
* Update docs/nczarr.md
* Rebuild using the .y and .l files
2024-06-19 18:09:29 -06:00
Ward Fisher
f29cff2408 Bumped to next version. 2024-06-18 14:15:47 -06:00
Ward Fisher
c1a654b858 Fixing the 'standard filters' summary for cmake-based builds. 2024-06-13 16:59:06 -06:00
Ward Fisher
be009ed741
Merge pull request #2935 from WardF/gh2700.wif
Add compiler flag to fix infinities issue with intel compilers.
2024-06-12 15:43:59 -06:00
Ward Fisher
effdd8a3a2 Add compiler flag to fix infinities issue with intel compilers. 2024-06-12 10:42:48 -06:00
Ward Fisher
a63060cd1b Bump SO version according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html in preparation for the next release. 2024-06-11 15:36:05 -06:00
Ward Fisher
4cf768e90f
Merge branch 'main' into v4.9.3-rc1-prep.wif 2024-06-11 12:22:20 -05:00
Ward Fisher
7b610e2f05 Add stanza for Release Candidate 1 in Release Notes 2024-06-11 11:20:10 -06:00
Ward Fisher
6abcddbb43
Merge pull request #2931 from DennisHeimbigner/loglevel.dmh
Cleanup handling of NETCDF_ENABLE_SET_LOG_LEVEL and NETCDF_ENABLE_SET_LOG_LEVEL_FUNC
2024-06-07 12:58:44 -05:00
Ward Fisher
1a83e12eb3 Clean up surperflous options that will always align with the value of enable-logging 2024-06-06 15:24:13 -06:00
Ward Fisher
ec202ff79d Make change to config.h generated by cmake 2024-06-06 15:13:02 -06:00
Ward Fisher
8af3891c86 Remove redunandant option. 2024-06-06 15:12:23 -06:00
Ward Fisher
27f1bbfc5f
Merge pull request #2933 from WardF/fix-hdf4-detection.wif
Fix a few issues related to detection of libhdf4.
2024-06-04 17:49:12 -05:00
Ward Fisher
d431224752 Update deprecated function list. 2024-06-04 16:21:21 -06:00
Ward Fisher
cb321fa0db Fix a few issues related to detection of libhdf4. 2024-06-04 16:15:49 -06:00
Dennis Heimbigner
ddb0043eda Update release notes 2024-05-24 18:16:21 -06:00
Dennis Heimbigner
fd637fd460 Cleanup handling of NETCDF_ENABLE_SET_LOG_LEVEL and NETCDF_ENABLE_SET_LOG_LEVEL_FUNC
The NETCDF_ENABLE_SET_LOG_LEVEL_FUNC option is apparently not used, but
is effectively used to set NETCDF_ENABLE_SET_LOG_LEVEL.
This is not clear from the build files CMakeLists.txt and configure.ac.
So this PR cleanups the code to make it more clear what is going on.
2024-05-24 16:48:04 -06:00
DWesl
1770b753a3
BUG: Fix CMake syntax for Cygwin plugin prefix/suffix 2024-05-24 17:20:52 -04:00
DWesl
ff5a18d822
CI: Don't enable DAP on Cygwin
I don't know that it ever worked before, and it isn't working now.
2024-05-24 16:07:51 -04:00
DWesl
0c10f11c7a
TST: Skip nc_test4_tst_filter on Cygwin.
Already skipped on MinGW, so I don't feel bad skipping it on Cygwin too.  Still haven't figured out why it's crashing.  I should probably look into why Autotools is fine.
2024-05-24 15:51:30 -04:00
DWesl
92f71ed657
CI: Remove a few environment variables from Cygwin CMake build
Let's see if the build works without these.  The export-everything is going to be the real test.

LDFLAGS="-Wl,--export-all-symbols"
MAKE=/usr/bin/make
2024-05-24 15:03:38 -04:00
Ward Fisher
09a5fa333d
Merge pull request #2928 from DennisHeimbigner/sdkinit.dmh
Fix duplicate definition when using aws-sdk-cpp.
2024-05-22 12:12:59 -06:00
Ward Fisher
2add09a0d7
Merge branch 'main' into DAOS_sync 2024-05-21 11:58:36 -06:00
Dennis Heimbigner
9a478edb06 Fix duplicate definition when using aws-sdk-cpp.
re: Issue https://github.com/Unidata/netcdf-c/issues/2927

The NC_s3sdkinitialize NC_s3sdkfinalize functions were
misplaced. They should have been moved from ds3util.c to
ncs3sdk_h5.c.  When using ncs3sdl_aws.cpp, this resulted in a
duplicate definition.

Also, found and fixed a memory leak in the NCZarr S3 code.
2024-05-20 19:15:19 -06:00
Ward Fisher
517d0b45c4
Merge pull request #2926 from DennisHeimbigner/cleanup.dmh
Cleanup various obsolete build issues
2024-05-20 14:39:57 -06:00
Peter Hill
780bf94dd1
Merge branch 'main' into silence-libdap2-warnings
* main: (29 commits)
  ftp --> resources
  Update release notes
  Convert the ENABLE_XXX options to NETCDF_ENABLE_XXX options
  Modify CMakeLists.txt to honor CMAKE_INSTALL_MANDIR in support of https://github.com/Unidata/netcdf-c/issues/2920.
  Modify ncdump to print char-valued variables as utf8.
  CI: Create an MSYS2/MinGW CMake run.
  CI: Test on MSYS2/UCRT64 environment
  CMake: Fix running tests on MinGW
  removal of ftp and contrib site
  removal of ftp site
  removal of ftp and netcdf contrib site
  removal of ftp and netcdf contrib site
  comment
  ftp --> resources for sample data location
  ftp--> resources for sample data location
  CMake: Enable plugins on MinGW
  Reintroduce targets to allow for cmake-based netCDF-Fortran to find and linka gainst netCDF-C. Stop-gap measure until we can modify netCDF-Fortran to use a more modern approach.
  revert
  Fix conversion warning in flag set/check/clear macros
  ckp
  ...
2024-05-16 10:08:00 +01:00
Dennis Heimbigner
e2fc648db5 Update release notes 2024-05-15 19:06:46 -06:00
Dennis Heimbigner
d80c6d27cf Merge branch 'master' into cleanup.dmh 2024-05-15 19:05:54 -06:00
Ward Fisher
5d70252627
Merge pull request #2898 from ZedThree/silence-ncdap4-warnings 2024-05-15 17:57:57 -07:00
Dennis Heimbigner
f0f0f39950 Cleanup various Zarr-related build issues
# Description
Remove various obsolete build options. Also do some code movement.

## Specific Changes

* The remotetest server is sometimes unstable, so provide a mechanism
  to force disabling calls to remotetest.unidata.ucar.edu.
  This is enabled by adding a repository variable named
  REMOTETESTDOWN with the value "yes".
* Fix CMakeLists.txt to use the uname command as an alternate
  to using the hostname command (which does not work under cygwin).
* Remove the JNA stuff as obsolete
* Remove the ENABLE_CLIENTSIDE_FILTERS options since it has been
  disabled for a while.
* Fix bad option flag in some github action .yml files: change --disable-xml2 to --disable-libxml2
* Collect globalstate definitions into nc4internal.h
* Remove ENABLE_NCZARR_FILTERS_TESTING option as obsolete and replace
  with ENABLE_NCZARR_FILTERS
* Move some dispatcher independent functions from libsrc4/nc4internal.c to libdispatch/ddispatch.c
* As a long term goal, and because it is now the case that --enable-nczarr
    => USE_NETCDF4, make the external options --enable-netcdf-4 and
    --enable-netcdf4 obsolete in favor of --enable-hdf5
    We will do the following for one more release cycle.
        1. Make --enable-netcdf-4 be an alias for --enable-netcdf4.
        2. Make --enable-netcdf4 an alias for --enable-hdf5.
        3. Internally, convert most uses of USE_NETCDF_4 ad USE_NETCDF4 to USE_HDF5
    After the next release, --enable-netcdf-4 and --enable-netcdf4 will
    be removed.
2024-05-15 18:46:25 -06:00
Peter Hill
12840aba2f
Merge branch 'main' into silence-ncdap4-warnings
* main:
  ftp --> resources
  Update release notes
  Convert the ENABLE_XXX options to NETCDF_ENABLE_XXX options
  CI: Create an MSYS2/MinGW CMake run.
  CI: Test on MSYS2/UCRT64 environment
  CMake: Fix running tests on MinGW
2024-05-15 17:21:32 +01:00
Ward Fisher
f8164e3b73
Merge pull request #2917 from MehdiChinoune/ci-mingw
CI: Setup a CMake job for MSYS2/MinGW
2024-05-14 17:26:43 -07:00