Commit Graph

10145 Commits

Author SHA1 Message Date
DWesl
aa4cdf8d2c Merge upstream into patch-4 2024-06-22 11:11:33 -04: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
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
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
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
Ward Fisher
5b333a7c91
Merge pull request #2924 from oxelson/main
ftp --> resources, part II
2024-05-14 15:47:20 -07:00
Jennifer Oxelson
ef5fcf962b ftp --> resources 2024-05-13 16:50:50 -06:00
DWesl
986b95ce8c ENH:Cygwin: Set plugin prefix and suffix in CMake. 2024-05-13 15:53:59 -04:00
Ward Fisher
2960f56b81
Merge pull request #2923 from DennisHeimbigner/optionchange.dmh
Convert the ENABLE_XXX options to NETCDF_ENABLE_XXX options for NCZarr
2024-05-13 08:10:31 -07:00
Dennis Heimbigner
9d8f2e24e9 Update release notes 2024-05-11 19:38:03 -06:00
Dennis Heimbigner
69ed78e7d7 Convert the ENABLE_XXX options to NETCDF_ENABLE_XXX options
# Primary Change
In order to conform to the cmake overhaul, occurrences of
ENABLE_XXX options in the nczarr code have been changed to
NETCDF_ENABLE_XXX.

# Misc. Other changes
* Fix use of rand_s in libdispatch/ncrandom.c
* Fix some bugs in the mingw gitub action.
* Fix signature bug in libncpoco/cp_win32.c
* Make some NCZarr fixes to config.h.cmake.in
2024-05-11 16:23:40 -06:00
Peter Hill
c841dcea8c
Merge branch 'main' into silence-ncdap4-warnings
* main:
  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.
  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
  ckp
  test1
  debug1
2024-05-10 15:35:31 +01:00
DWesl
6a1716da28
FIX: Ensure CMake build has C++
That's the one that needed it.
2024-05-09 14:12:09 -04:00
DWesl
52eaf083fd
FIX: Force CXX=/usr/bin/g++
This should really not be needed
2024-05-09 14:11:14 -04:00
DWesl
bc522f118a
FIX: Force MAKE=/usr/bin/make
Why isn't CYGWIN_NOWINPATH working?
2024-05-09 14:06:16 -04:00
DWesl
8a52acb360
FIX: Install C++ compiler. 2024-05-09 14:02:23 -04:00
DWesl
8cd7881355
FIX: Ensure running Cygwin CMake 2024-05-09 14:00:18 -04:00
DWesl
4ec1b935d8
FIX: Capitalization of Makefile CMake builder 2024-05-09 12:34:31 -04:00
DWesl
cbc4aa6fc5
FIX: Run initial git command with Windows shell. 2024-05-09 11:26:15 -04:00
DWesl
e2bbe13afe
BUG: Try to fix CI YAML syntax. 2024-05-09 11:21:47 -04:00
DWesl
fbe383dab1
CI: Add Cygwin CMake run
Copied from MehdiChinoune's MSYS CMake CI run.
2024-05-09 11:14:30 -04:00
Ward Fisher
8d7916cedc
Merge pull request #2922 from WardF/gh2920.wif
Honor CMAKE_INSTALL_MANDIR
2024-05-08 11:29:25 -05:00
Ward Fisher
ebd3f36a9a Modify CMakeLists.txt to honor CMAKE_INSTALL_MANDIR in support of https://github.com/Unidata/netcdf-c/issues/2920. 2024-05-07 16:46:43 -06:00
Ward Fisher
58e37e0ecc
Merge pull request #2921 from DennisHeimbigner/utf8dump.dmh
Modify ncdump to print char-valued variables as utf8.
2024-05-07 17:20:08 -05:00
Dennis Heimbigner
211538cf25 Modify ncdump to print char-valued variables as utf8.
re: Issue https://github.com/Unidata/netcdf-c/issues/2916

Currently, ncdump prints char-valued variables as a mix
of ascii and octal characters. The octal format is used
for non-printable ascii character values.

This PR changes this to print the char variable values
as raw binary. This means in practice that utf-8 tags
are properly interpreted and printed as utf-8.
2024-05-07 10:36:14 -06:00
Dennis Heimbigner
e31e08f313 Merge remote-tracking branch 'Unidata/main' 2024-05-07 08:57:34 -06:00
مهدي شينون (Mehdi Chinoune)
c72360eef1 CI: Create an MSYS2/MinGW CMake run. 2024-05-07 04:47:19 +01:00
مهدي شينون (Mehdi Chinoune)
7c100f65e5 CI: Test on MSYS2/UCRT64 environment
see: https://www.msys2.org/docs/environments
2024-05-07 04:47:18 +01:00
مهدي شينون (Mehdi Chinoune)
c5c2d931cc CMake: Fix running tests on MinGW 2024-05-07 04:44:54 +01:00
Ward Fisher
f5c9183dd5
Merge pull request #2914 from MehdiChinoune/mingw-plugins
CMake: Enable plugins on MinGW
2024-05-06 15:44:11 -05:00