mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-06 15:34:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,946 Commits 90 Branches 75 Tags 88 MiB
32b53c9483
Commit Graph

8946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dennis Heimbigner
8b0e1134b4 Ensure that netcdf_json.h does not interfere with ncjson. 
re: Issue https://github.com/Unidata/netcdf-c/issues/2419

There are effectively two json subsystems in netcdf-c.
1. ncjson.[ch] in libnetcdf
2. netcdf_json.h for use by plugins so they can be built without need
   for libnetcdf.

The netcdf_json.h file is constructed from the concatenation of
ncjson.h plus ncjson.c. It turned out that in doing this, I was
leaving some symbols externally visible so that if, for some
reason, a plugin was built and needed libnetcdf, then symbol
conflicts arose.

The solution is to prefix the declarations in ncjson.[ch] with a
macro (OPTSTATIC) that can be resolved to either nothing or to
"static". Then in netcdf_json.h, it resolves to "static" and
prevents the symbol conflicts.

Note that netcdf_json.h is constructed once in
netcdf-c/include/Makefile.am with the rule named
"makepluginjson". This means that it is included in the
distribution. However, this also means that if ncjson.[ch] is
changed, then it is necessary to invoke makepluginjson
explicitly to rebuild netcdf_json.h
 2022-07-05 22:03:52 -06:00
Ward Fisher
b2641a1fc5
Merge branch 'main' into cmakeplugin.dmh 2022-07-05 16:27:51 -06:00
Edward Hartnett
4e4209b6f0 code and documentation cleanup 2022-07-02 08:13:13 -06:00
Edward Hartnett
309d4bec35 code and documentation cleanup 2022-07-02 07:51:33 -06:00
Edward Hartnett
a2aeec8936 documentation 2022-07-02 06:19:52 -06:00
Edward Hartnett
536cdd28f9 fix and test quantize mode for NC_CLASSIC_MODEL 2022-07-02 06:14:32 -06:00
Ward Fisher
a00bb62167
Merge pull request #2439 from WardF/disable_quant_option.wif 
Add `--disable-quantize` to configure
 2022-07-01 10:05:35 -06:00
Ward Fisher
b6bdcacde7 Update release notes. 2022-06-30 14:44:09 -06:00
Ward Fisher
d1a3f6fbe6 configure.ac logic for disabling quantize. 2022-06-30 14:41:18 -06:00
Ward Fisher
a494ac50cd
Merge pull request #2438 from WardF/gh2271.wif 
Updated CMakeLists to avoid corner case cmake error
 2022-06-29 16:29:58 -06:00
Ward Fisher
f3426bc7d9 Updated CMakeLists to avoid the error described in https://github.com/Unidata/netcdf-c/issues/2271 2022-06-29 14:44:49 -06:00
Ward Fisher
5794ae4dd3
Merge pull request #2437 from WardF/gh2435.wif 
Fix pnetcdf tests in cmake
 2022-06-28 18:52:44 -06:00
Ward Fisher
9d44421024 Work in a one-line change as originally suggested in https://github.com/Unidata/netcdf-c/pull/2426. 2022-06-28 16:58:24 -06:00
Ward Fisher
dfc47497e3 Make pnetcdf tests run in serial fashion when using cmake 2022-06-28 16:53:38 -06:00
Ward Fisher
ae0b5e7d8c
Merge branch 'main' into cmakeplugin.dmh 2022-06-28 16:38:31 -06:00
Ward Fisher
7d6d4b9b40 Fix a typo. 2022-06-28 16:31:15 -06:00
Ward Fisher
73a0d92f9d Fix a typo. 2022-06-28 16:30:26 -06:00
Ward Fisher
e34f8d5dc0 Run one-off tests first. 2022-06-28 16:29:35 -06:00
Ward Fisher
ff34b66182 Fix cache check. 2022-06-28 16:27:23 -06:00
Ward Fisher
8637265e7f Merge branch 'main' into gh2435.wif 2022-06-28 16:15:44 -06:00
Ward Fisher
f414e51b1a
Merge pull request #2423 from edwardhartnett/ejh_docs_1 
fixed RELEASE_NOTES.md
 2022-06-28 16:15:11 -06:00
Ward Fisher
baaa2b6f00 Building test programs invoked by run_pnetcdf_tests.sh 2022-06-28 15:28:40 -06:00
Ward Fisher
bfca030037 Fixing cmake-based run_pnetcdf_tests.sh 2022-06-28 15:04:58 -06:00
Ward Fisher
24bdf6c067 Generate nc_test/run_pnetcdf_tests.sh when using cmake, in support of https://github.com/Unidata/netcdf-c/issues/2435 2022-06-28 14:56:38 -06:00
Ward Fisher
47d35cc24e
Merge pull request #2319 from wkliao/part 2022-06-27 11:47:20 -06:00
Dennis Heimbigner
ccecc3065b debug1 2022-06-25 18:42:50 -06:00
Dennis Heimbigner
feb07359cd Update Release notes 2022-06-25 16:49:28 -06:00
Dennis Heimbigner
c633de1125 Fix way CMake handle -DPLUGIN_INSTALL_DIR 
re: Issue https://github.com/Unidata/netcdf-c/issues/2429

The CMake tests for -DPLUGIN_INSTALL_DIR only accepted
"on" or "off" as boolean values. So extend to accept e.g.
-DPLUGIN_INSTALL_DIR=yes or -DPLUGIN_INSTALL_DIR=1, etc.
 2022-06-25 16:47:49 -06:00
Dennis Heimbigner
d594f72a6d force rebuild 2022-06-23 16:08:58 -06:00
Dennis Heimbigner
bc55212936 Minimal changes to RELEASENOTES to get a working patch 2022-06-23 15:51:21 -06:00
Dennis Heimbigner
43ec0e5216 undebug 2022-06-23 14:10:45 -06:00
Dennis Heimbigner
f3ef83ea46 fix RELEASENOTES 2022-06-23 14:08:58 -06:00
Edward Hartnett
e45292f6ca moved quantize error documentation 2022-06-23 09:51:09 +02:00
Edward Hartnett
68b0d50af0 change to trigger CI 2022-06-23 07:25:09 +02:00
Edward Hartnett
f9494ab296 change to trigger CI 2022-06-23 07:09:16 +02:00
Edward Hartnett
03668614b8 changed backslash to and 2022-06-23 06:46:01 +02:00
Edward Hartnett
a9ffa1c503 fixed missing quote 2022-06-23 06:44:03 +02:00
Edward Hartnett
650ae97fa8 fixed missing quote 2022-06-23 06:43:23 +02:00
Edward Hartnett
45f29f884a fixed RELEASE_NOTES.md 2022-06-23 06:18:17 +02:00
Dennis Heimbigner
20a4b655ec Update release notes 2022-06-22 17:09:17 -06:00
Dennis Heimbigner
f419af9204 Cleanup szip handling some more 
re: https://github.com/Unidata/netcdf-c/issues/2420

nc_test4/tst_vars3.c has the wrong conditional
around the szip tests (did I do that?).
Anyway, the current test is
> #ifdef HAVE_SZ

and it should be
> #ifdef HAVE_H5Z_SZIP

because the only thing that matters is that HDF5 lib has szip support.
 2022-06-22 16:40:54 -06:00
Ward Fisher
884610d2f1
Merge pull request #2392 from edwardhartnett/ejh_notes 
updated release notes
 2022-06-22 14:00:03 -06:00
Ward Fisher
545ce88476
Merge pull request #2377 from edwardhartnett/ejh_update_doxyfile 
Updating Doxyfile.in with doxygen-1.8.17, turned on WARN_AS_ERROR, added doxygen build to CI run
 2022-06-22 13:31:25 -06:00
Ward Fisher
3dfc730af4
Merge branch 'main' into ejh_notes 2022-06-22 13:15:24 -06:00
Ward Fisher
648a8f1fd1
Merge pull request #2417 from WardF/gh2410-retry.wif 
Check for libxml2 development files
 2022-06-22 11:01:52 -06:00
Ward Fisher
d6dee0c8ca Add libxml2 install to mingw GitHub actions. 2022-06-21 17:05:47 -06:00
Ward Fisher
c8a6628da2 Added a check for xml2-config as a test for the libxml2-dev header files. 2022-06-21 16:56:19 -06:00
Ward Fisher
6d55794fe1
Merge pull request #2416 from DennisHeimbigner/homedir.dmh 
Fix choice of HOME dir
 2022-06-21 15:44:26 -06:00
Ward Fisher
7eeb3f8ea7
Merge pull request #2412 from georgthegreat/patch-1 
Fix typo in CMakeLists.txt
 2022-06-21 14:29:30 -06:00
Dennis Heimbigner
7a22b7c630 Use env variable USERPROFILE instead of HOME for windows and mingw. 
re: https://github.com/Unidata/netcdf-c/issues/2380
re: https://github.com/Unidata/netcdf-c/issues/2337

This PARTIALLY fixes some HOME problems because under Windows,
the HOME environment variable may not be set. In that case, use the
USERPROFILE environment variable instead.
 2022-06-21 14:09:10 -06:00