Commit Graph

4019 Commits

Author SHA1 Message Date
Ward Fisher
477507da99 Merge remote-tracking branch 'origin/curlopt.dmh' into gh488 2017-09-25 11:30:44 -06:00
Ward Fisher
37f89515b2 Updatec cleanfiles in makefile.am 2017-09-21 09:58:33 -06:00
Ward Fisher
11f235f86e Fixing more make distcheck errors. 2017-09-20 16:28:28 -06:00
Ward Fisher
10a9d6c4f8 Corrected another error. 2017-09-20 16:03:16 -06:00
Ward Fisher
05ddb3a953 Cleaning up 'make distcheck' 2017-09-20 15:59:24 -06:00
Ward Fisher
3822751043 Corrected a missing break in a switch statement. 2017-09-20 14:18:43 -06:00
Ward Fisher
4a596cea3c Corrected conditional logic syntax in a few shell test scripts. 2017-09-20 11:29:25 -06:00
Ward Fisher
200e17f42c Merge branch 'cdf5-optional' of github.com:Unidata/netcdf-c into cdf5-optional 2017-09-20 11:25:48 -06:00
Ward Fisher
3414a30c1a Updated test to use new file name. 2017-09-20 11:25:36 -06:00
Ward Fisher
585ebc0e00 Corrected typos. 2017-09-20 11:22:33 -06:00
Ward Fisher
2151dbbd44 Giving test output netcdf files unique names. 2017-09-20 11:17:33 -06:00
Ward Fisher
0913eb65f7 Fixed another typo. 2017-09-19 16:18:25 -06:00
Ward Fisher
8ac9c3a524 Corrected typo in script. 2017-09-19 16:14:48 -06:00
Ward Fisher
15dd704fb3 Made small file test dependent on having CDF5. 2017-09-19 14:48:24 -06:00
Dennis Heimbigner
d1e17b5ee7 re: pull request: https://github.com/Unidata/netcdf-c/issues/487
The use of the following version-specific curl flags
is not always properly wrapped or aliased using
config.h HAVE_CURL... ifdefs.
# CURLOPT_USERNAME is not defined until curl version 7.19.1
# CURLOPT_PASSWORD is not defined until curl version 7.19.1
# CURLOPT_KEYPASSWD is not defined until curl version 7.16.4
  -- aliased as needed to CURLOPT_SSLKEYPASSWD
# CURLINFO_RESPONSE_CODE is not defined until curl version 7.10.7
  -- aliased as needed to CURLINFO_HTTP_CODE
# CURLOPT_CHUNK_BGN_FUNCTION is not defined until curl version 7.21.0
  -- not used in our code
2017-09-18 16:44:31 -06:00
Ward Fisher
223b1f968a Updated tst_small 2017-09-18 15:08:49 -06:00
Ward Fisher
4b35c43a5e Updated release notes. 2017-09-18 14:44:17 -06:00
Ward Fisher
a5a9e483ff Corrected an issue with --has-szlib 2017-09-18 14:40:51 -06:00
Ward Fisher
1f07874421 Added --has-cdf5 to nc-config generated by autotools. 2017-09-18 14:32:20 -06:00
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
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