Commit Graph

4342 Commits

Author SHA1 Message Date
Ward Fisher
02cd18125d Merge branch 'cdf5-optional' of github.com:unidata/netcdf-c into cdf5-optional 2017-09-18 14:25:32 -06:00
Ward Fisher
62c709fe54 Added --has-cdf5 to nc-config, cmake generated. 2017-09-18 14:24:54 -06:00
Ward Fisher
3c410f5257 Made nccopy aware of USE_CDF5 flag. 2017-09-18 14:11:53 -06:00
Ward Fisher
143fb237f9 Disabled CDF5 generation support for ncgen if USE_CDF5 is false. 2017-09-18 13:31:15 -06:00
Ward Fisher
399a43ae89 Updated nc_test to respect USE_CDF5 2017-09-18 13:24:11 -06:00
Ward Fisher
aea3dac7eb Merge branch 'v4.5.0-release-branch' into cdf5-optional 2017-09-18 11:13:29 -06:00
Dennis Heimbigner
ddacf2db38 When ncgen is invoked without a -k flag,
it tries to infer the file kind based on
the constructs and types used in the .cdl
file. Previously, it included cdf5 as an
inferrable kind, but this is almost never
what is wanted. So limit inferable kinds
to netcdf classic vs netcdf enhanced.
Also fix tst_inttags4.sh test.
2017-09-15 21:03:05 -06:00
Ward Fisher
d2cdc4cb5a Working on getting cdf5 tests running. 2017-09-15 18:00:28 -06:00
Ward Fisher
c0244bc4dc Updated inttags4 test. 2017-09-15 17:31:03 -06:00
Ward Fisher
c740f47895 Corrected for no CDF5 support. 2017-09-15 17:29:10 -06:00
Ward Fisher
e70fcc9865 Revert a previous change. 2017-09-15 16:29:11 -06:00
Ward Fisher
62d80a3f8f Corrected problem in configure.ac 2017-09-15 16:11:57 -06:00
Ward Fisher
d048ccf583 Moved tst_inttags4.sh to only run if CDF5 is enabled. 2017-09-15 11:18:42 -06:00
Ward Fisher
eb354c71df Flagging test to only run when CDF5 is enabled. 2017-09-14 15:01:40 -06:00
Ward Fisher
1a56d3fdc8 Making cdf5 tests conditional on cdf5 support setting at configure time. 2017-09-14 14:18:56 -06:00
Ward Fisher
f82bcf9d15 Added USE_CDF5 to dfile.c 2017-09-14 12:38:48 -06:00
Ward Fisher
0043f4c76f Wiring in cdf5 option to cmake. 2017-09-13 15:27:11 -06:00
Ward Fisher
035ec80fb2 Wiring in CDF5 configure-time option. 2017-09-13 15:25:40 -06:00
Ward Fisher
15263f7a95 Merge pull request #482 from Unidata/d4rcfix.dmh
Important fix to d4rc.c
2017-09-08 17:06:09 -06:00
Dennis Heimbigner
b7f6941da8 It is imperative that this fix goes into
v4.5-release-candidate branch and master branch ASAP.

The bug occurs in d4rc.c where strcmp is being applied to NULL.
Also, the code in which it occurs is debugging code, so it needs
to be #ifdef'd.  This fix may cause minor conflicts with other
outstanding pull requests that fix the same bug. But the
conflicts should be minor and easy to resolve.
2017-09-08 13:54:02 -06:00
Ward Fisher
e4d6a13257 Merged in support of https://github.com/Unidata/netcdf-c/pull/470 2017-09-06 11:53:59 -06:00
Ward Fisher
a8d90288b6 Merge branch 'fill_value_undefined' of https://github.com/pelson/netcdf-c into gh470 2017-09-06 11:52:27 -06:00
Ward Fisher
69136c0ddd Merge branch 'patch-4' of https://github.com/gsjaardema/netcdf-c into v4.5.0-release-branch 2017-09-05 15:48:12 -06:00
Ward Fisher
8c03980cf3 Merge branch 'master' into fill_value_undefined 2017-09-05 15:46:47 -06:00
Ward Fisher
fde8720fd3 Infile given absolute path. 2017-09-05 13:13:08 -06:00
Ward Fisher
eeeef6f2a6 Tweaking makefile.am 2017-09-05 13:05:01 -06:00
Dennis Heimbigner
3cc3b6a4a1 add known szip file against which to test 2017-09-04 18:37:13 -06:00
Dennis Heimbigner
2633def32c Add Hack to handle winsock2 problem for cygwin 2017-09-03 16:01:18 -06:00
Dennis Heimbigner
ad32350355 Oops. Forgot to convert over libdap4 use of NC_mktmp
and NC_readfile and NC_combinehostport.
2017-09-03 15:09:10 -06:00
Dennis Heimbigner
a2e0f069ec This pr should probably be delayed until after Version 4.5.
Primary change is to cleanup code and remove duplicated code.

1. Unify the rc file reading into libdispatch/drc.c. Eventually extend
   if we need rc file for netcdf itself as opposed to the dap code.
2. Unify the extraction from the rc file of DAP authorization info.
3. Misc. other small unifications: make temp file, read file.
4. Avoid use of libcurl when reading file:// because
   there is some kind of problem with the Visual Studio version.
   Might be related to the winpath problem.
   In any case, do direct read instead.
5. Add new error code NC_ERCFILE for errors in reading RC file.
6. Complete documentation cleanup as indicated in this comment
   https://github.com/Unidata/netcdf-c/pull/472#issuecomment-325926426
7. Convert some occurrences of #ifdef _WIN32 to #ifdef _MSC_VER
2017-09-02 18:09:36 -06:00
Greg Sjaardema
3a30cdc1bc Fix bad output from nc-config
I was getting "yes" output from some of the options which were not enabled.  This was due to two reasons:
* If CMake set the variable to "OFF", then the `-z $var test` would fail and `$var` would be set to "yes" even though it should be "no"
* If CMake set the variable to empty string (`has_var=""`), then the `-z $has_var` test would also fail and set it to yes instead of no.

With these changes, it looks like I am getting the correct output from nc-config consistent with my configuration options.
2017-09-02 08:36:58 -06:00
Ward Fisher
1f7ea554a8 Added execute flag 2017-09-01 16:47:26 -06:00
Ward Fisher
62511cc634 Removed a stray line in makefile.am 2017-09-01 13:03:49 -06:00
Ward Fisher
db7f9c518a Updated release notes in relation to https://github.com/Unidata/netcdf-c/issues/425 and https://github.com/Unidata/netcdf-c/issues/463 2017-09-01 12:36:12 -06:00
Ward Fisher
0119b7f83b Merge branch 'v4.5.0-release-branch' into gh425 2017-09-01 12:02:35 -06:00
Ward Fisher
b6ebc0e77e Wired in new test to CMake-based build. 2017-09-01 11:58:37 -06:00
Ward Fisher
812a7b223d Wiring new test into autotools. 2017-09-01 11:57:28 -06:00
Ward Fisher
a5d9c2dbcd Adding a test to check for regressions when subsetting a netCDF3 file. 2017-09-01 11:47:42 -06:00
Ward Fisher
a95a7c18bb Corrected an issue with netcdf3 files that would prevent the -v and -V flags from working properly when using nccopy. See https://github.com/Unidata/netcdf-c/issues/425 and https://github.com/Unidata/netcdf-c/issues/463 for more information. 2017-08-31 16:16:21 -06:00
Dennis Heimbigner
3a99220789 Make branch compile under cmake 2017-08-31 15:32:41 -06:00
Dennis Heimbigner
a17fa2ed2a add dutil.c 2017-08-31 14:36:54 -06:00
Dennis Heimbigner
35b97e0454 add dauth.c 2017-08-31 14:36:04 -06:00
Dennis Heimbigner
8e2abdeed8 Initial version 2017-08-31 14:19:56 -06:00
Dennis Heimbigner
dd8bb4f5b0 Merge branch 'master' into newrc.dmh 2017-08-30 19:32:25 -06:00
Dennis Heimbigner
95f697f216 Clarify documentation 2017-08-30 19:21:30 -06:00
Dennis Heimbigner
61d2b38c8e Final fixes 2017-08-30 19:13:52 -06:00
Dennis Heimbigner
7c592cfb2a 1. Unify the rc file reading into libdispatch/drc.c. Eventually extend
if we need rc file for netcdf itself as opposed to the dap code.
2017-08-30 17:44:57 -06:00
Ward Fisher
2bf1f68cf7 Updated release notes in support of https://github.com/Unidata/netcdf-c/pull/473 2017-08-30 12:24:52 -06:00
Ward Fisher
6bdb975ceb Merge branch 'patch-2' of https://github.com/gsjaardema/netcdf-c into gsjaardema 2017-08-30 12:22:04 -06:00
Dennis Heimbigner
dab3d0da8e Fix CMake problem with executable naming 2017-08-30 12:06:23 -06:00