Commit Graph

525 Commits

Author SHA1 Message Date
Ward Fisher
e8af76c2f4 Wiring in a quick test. 2017-11-20 13:52:06 -07:00
Ward Fisher
16d6f94f30 Merge branch 'master' into filters.dmh 2017-11-13 11:15:02 -07:00
Dennis Heimbigner
9935d54fdf Merge master and resolve conflicts 2017-10-28 13:57:23 -06:00
Dennis Heimbigner
733da154c5 1. Keep up to date by merging master
2. Factored out the parameter string parsing for ncgen and nccopy
   int libdispatch/dfilter.c + include/ncfilter.h
3. Allow a parameter string to use constant types other than
   unsigned int. See docs/filters.md for details.
4. Moved the old content of  include/netcdf_filter.h into include/netcdf.h
   and removed include/netcdf_filter.h as no longer needed.
5. Force the test filter (bzip2) in nc_test4/filter_test to
   be built using BUILT_SOURCES.
2017-10-08 15:56:45 -06:00
Ward Fisher
41424fb95e Corrected DAP4 and NC4 logic 2017-09-26 15:26:34 -06:00
Ward Fisher
3c61d86367 Syntax corrections. 2017-09-26 14:01:21 -06:00
Ward Fisher
b1ad6b8c2f Updating netcdf_meta.h to include CDF5. 2017-09-26 11:32:12 -06:00
Ward Fisher
4299653319 Updated an issue with libcurl and dap4 on Windows 2017-09-25 17:38:48 -06:00
Ward Fisher
8b824a3dd0 Added support for probing libcurl for CURLINFO_HTTP_CODE in cmake. 2017-09-25 13:29:04 -06:00
Ward Fisher
86cfb9b39c Disable CDF5 support by default for the time being. 2017-09-25 13:19:56 -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
Dennis Heimbigner
2633def32c Add Hack to handle winsock2 problem for cygwin 2017-09-03 16:01:18 -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
Dennis Heimbigner
d8d4ed627a master merge 2017-08-29 18:05:46 -06:00
Dennis Heimbigner
99e4250d6d Get szip working under cmake 2017-08-27 20:38:37 -06:00
Wei-keng Liao
8b6d131cbe Because ncx.c and putget.c are to be released with the package in case users do not have m4, the generation of the two C files cannot depend on the configure option of --enable-erange-fill. This commit fixes this problem by replacing m4 conditional define with C conditional preprocess. 2017-08-20 14:32:57 -05:00
Ward Fisher
9e7a902dcf Merge branch 'issue435.dmh' into multi-pull 2017-07-27 12:20:11 -06:00
Ward Fisher
3e166fd26a Accomodating Windows winsock issue. 2017-07-26 13:40:03 -06:00
Ward Fisher
97b8e9d4cb Corrected the way large file support was implemented in cmakelists.txt, not sure why it was like that to start with. In support of https://github.com/Unidata/netcdf-c/issues/385 2017-07-13 17:15:56 -06:00
Dennis Heimbigner
9719fbfbad re: hithub issue https://github.com/Unidata/netcdf-c/issues/435
Some temporary files are being left in a tempdir (e.g. /tmp
under *nix*).

The situation is described tersely in
netcdf-c/docs/auth.html#REDIR Basically, when a url is used that
requires redirection, a physical cookiejar file is required
to exist in the file system in order for this to work.

Since it was difficult to figure out when redirection was
being used (it was internal to libcurl) I needed to be prepared for that
eventuality. The result was that I always created a cookiejar file if one
was not specified in the rc file. This actually occurs in two places:
one inside oc2 and one inside libdap4.

The solution was two-fold:
1. do not use a cookiejar directory -- create cookiejar file directly
2. ensure that all cookiejar related files are reclaimed by nc_close().
Note that if nc_close (or nc_abort) is not called for whatever reason,
then reclamation will not occur.
2017-07-05 10:03:48 -06:00
Ward Fisher
3a0b0d5339 Replaced sed with configure_ac_files, since sed may not be available. 2017-06-07 13:21:07 -06:00
Ward Fisher
81b0ab959a Fixed a missing file. 2017-06-01 14:13:54 -06:00
Ward Fisher
ec33411c6c Bumped revision information to next version. 2017-06-01 13:35:39 -06:00
Ward Fisher
cebc9301ec Merge branch 'gh410' 2017-06-01 11:16:11 -06:00
Ward Fisher
ebd1fca32a Working on reformulating test_common.sh 2017-05-31 15:42:59 -06:00
Ward Fisher
c0c9c60025 Additional tweaking. 2017-05-30 13:52:56 -06:00
Ward Fisher
26f8ebda46 Computed new interace version flags. 2017-05-30 13:05:31 -06:00
Ward Fisher
02a6585eae Corrected some typos. 2017-05-24 15:49:18 -06:00
Ward Fisher
8dddd222a3 Merged master, DAP4 support into branch. 2017-04-19 09:29:35 -06:00
Dennis Heimbigner
6a4ba35565 Fix pull request https://github.com/Unidata/netcdf-c/pull/374 (dap4.dmh)
1. Cleanup test_common.sh to expunge (mostly) the use of the VS
   path value. This has the effect of being unable to use the
   Visual Studio C compiler for shell tests.
2. There is a missing case in CMakeLists.txt so add
   defaulting for HDF5_C_LIBRARY_hdf5 using HDF5_C_LIBRARY.
   Ward should probably examine this to get it fixed correctly.
3. Put back ref to esg.md in docs/Doxyfile.in
4. Fix minor warning in dut8proc.h
2017-04-10 09:26:57 -06:00
Ward Fisher
a0bee2e80f Updated open name for relaxed coordinate bounds. 2017-04-06 16:59:21 -06:00
Ward Fisher
908f787b64 Modified enable erange fill option to be disabled by default. 2017-04-05 17:09:39 -06:00
Dennis Heimbigner
6d8809100f Fix pull request https://github.com/Unidata/netcdf-c/pull/374 (dap4.dmh)
1. When running under windows (as opposed to cygwin)
   we need to make sure to not user /cygdrive/ file paths.
   This was ocurring in libdap4/d4read.c, but may occur
   elsewhere.
2. Shell scripts in the git repo are not being checked-out
   with the executable mode set. Had core.filemode set to false.
   Was a major hassle to fix.
2017-04-03 21:39:44 -06:00
Ward Fisher
80d2b914a1 Updates for Visual-Studio-based builds. 2017-03-16 14:34:33 -06:00
Ward Fisher
53c018a3f6 Attempting to fix visual studio errors in support of https://github.com/Unidata/netcdf-c/pull/375 2017-03-13 15:12:47 -06:00
Ward Fisher
d4a4dfdd15 Resolved a conflict. 2017-03-13 14:23:57 -06:00
Ward Fisher
8e3790f7ce Merged master. 2017-03-09 12:53:28 -07:00
Dennis Heimbigner
3db4f013bf Primary change: add dap4 support
Specific changes:
1. Add dap4 code: libdap4 and dap4_test.
   Note that until the d4ts server problem is solved, dap4 is turned off.
2. Modify various files to support dap4 flags:
	configure.ac, Makefile.am, CMakeLists.txt, etc.
3. Add nc_test/test_common.sh. This centralizes
   the handling of the locations of various
   things in the build tree: e.g. where is
   ncgen.exe located. See nc_test/test_common.sh
   for details.
4. Modify .sh files to use test_common.sh
5. Obsolete separate oc2 by moving it to be part of
   netcdf-c. This means replacing code with netcdf-c
   equivalents.
5. Add --with-testserver to configure.ac to allow
   override of the servers to be used for --enable-dap-remote-tests.
6. There were multiple versions of nctypealignment code. Try to
   centralize in libdispatch/doffset.c and include/ncoffsets.h
7. Add a unit test for the ncuri code because of its complexity.
8. Move the findserver code out of libdispatch and into
   a separate, self contained program in ncdap_test and dap4_test.
9. Move the dispatch header files (nc{3,4}dispatch.h) to
   .../include because they are now shared by modules.
10. Revamp the handling of TOPSRCDIR and TOPBUILDDIR for shell scripts.
11. Make use of MREMAP if available
12. Misc. minor changes e.g.
	- #include <config.h> -> #include "config.h"
	- Add some no-install headers to /include
	- extern -> EXTERNL and vice versa as needed
	- misc header cleanup
	- clean up checking for misc. unix vs microsoft functions
13. Change copyright decls in some files to point to LICENSE file.
14. Add notes to RELEASENOTES.md
2017-03-08 17:01:10 -07:00
Ward Fisher
9ea61d114b Corrected an issue detecting parallel hdf5 properly. 2017-03-06 15:34:14 -07:00
Ward Fisher
42c3be4823 Updated IP address of target cdash instance. 2017-03-01 12:34:49 -07:00
Ward Fisher
78c0f34c82 Merging master into branch. 2017-02-27 11:00:24 -07:00
Ward Fisher
7cb03504ed Merge branch 'master' into issue365.dmh 2017-02-23 13:55:10 -07:00
Ward Fisher
f96e0e8112 Merge branch 'master' into issue365.dmh 2017-02-22 12:17:01 -07:00
Ward Fisher
fa1c96a67f Attempting to fix an issue. 2017-02-22 09:55:13 -07:00
Ward Fisher
c2ee17acf6 Corrected for new cmake variables used by hdf5. 2017-02-21 17:00:45 -07:00
Dennis Heimbigner
96bd037560 re: https://github.com/Unidata/netcdf-c/issues/365
Following command fails under visual studio.
    ncdump -h http://thredds.ucar.edu/thredds/dodsC/nexrad/composite/gini/n0r/1km/20170216/Level3_Composite_n0r_1km_20170216_1635.gini

The problem is that sscanf for windows does not appear to support
scanning 8bit integers: it appears to only allow scanning of characters.

Solution:
Scan the input as an integer (for type Byte) or unsigned int (for type UByte)
and then recast the result as a char or unsigned char.

Primary code fix is in libdap2/dapcvt.c#dapcvtattrval
2017-02-19 21:41:51 -07:00
Ward Fisher
da28564469 Updated for Visual Studio support, in support of https://github.com/Unidata/netcdf-c/pulls/364 2017-02-17 15:38:55 -07:00
Ward Fisher
7cce9c30f0 Updated CMakeLists.txt to work on Windows. 2017-02-17 13:00:12 -07:00
Ward Fisher
f545023d0f More headache between discrepancies in CMake HDF5 variables. Updated to work on Windows as well as *nix. 2017-02-16 13:00:07 -07:00
Ward Fisher
581737b04e Integrating a big endian test. 2017-02-08 14:51:41 -07:00
Ward Fisher
6ff5ebf12f CMake Sync Issues 2017-02-08 10:31:15 -07:00
Ward Fisher
2f9bc02f98 Added a check for endianness in CMake, the lack of which and fix for was contributed by Wei-Keng Liao 2017-02-06 12:23:55 -07:00
Ward Fisher
dd125a92ee Updated hdf5 variable in CmakeLists file. 2017-02-03 11:04:05 -07:00
Ward Fisher
3e5124996e Merged https://github.com/Unidata/netcdf-c/pull/319 to resolve some recently arisen conflicts, in preparation for larger merge. 2017-02-01 13:27:29 -07:00
Ward Fisher
7c68a255c9 Merge branch 'master' into ghpull-335 2017-01-31 12:25:46 -07:00
Ward Fisher
870b6c534f Working out an error with unistd.h in windows. 2017-01-30 14:54:00 -07:00
Ward Fisher
0d2727d9da Merging pull request from gsjaardema, see https://github.com/Unidata/netcdf-c/pull/335 for more information. 2017-01-30 12:45:50 -07:00
Ward Fisher
209c31d3f3 Bringing config.h as generagted by cmake in line with config.h as generated by autotools. 2017-01-27 17:41:03 -07:00
Greg Sjaardema
e0269d6cac Add hdf5 collective metadata api detection to cmake build 2016-12-01 13:35:10 -07:00
Greg Sjaardema
7c808e849b Get parallel hdf5 detection working 2016-12-01 13:35:04 -07:00
Wei-keng Liao
4cdbf7dba5 Merge branch 'master' into issue258 2016-12-01 01:09:45 -06:00
Ward Fisher
becffaa784 Bumped SO version. 2016-11-21 10:25:30 -07:00
Wei-keng Liao
154b805dc4 check PnetCDF setting on erange-fill and adjust 2016-11-14 10:41:10 -06:00
Wei-keng Liao
e8cfdbb25a Merge branch 'master' into issue258 2016-11-13 00:00:54 -06:00
Wei-keng Liao
2081ae7099 add configure option --enable-relax-coord-bound for issue #243 2016-11-12 23:58:09 -06:00
Ward Fisher
f4a5d38992 Corrected issue for systems that don't have libsz installed. 2016-11-10 18:06:29 -07:00
Ward Fisher
12d9891305 Moved stanza for NC_EXTRA_DEPS before checking for other libraries. 2016-11-10 23:22:02 +00:00
Wei-keng Liao
5137be27d1 add configure/cmake option to disable erange_fill 2016-11-03 15:14:14 -05:00
Wei-keng Liao
7572e1cbbf add sizeof checks for unsigned data types 2016-10-28 18:16:49 -05:00
Ward Fisher
af9ffb7883 Added EXTREME_NUMBERS option to cmake, based on option in autotools, which had somehow not made it's way over previously. 2016-09-27 11:20:41 -06:00
Bas Couwenberg
6e5c74550d Fix HDF5 include directory with CMake >= 3.6.0.
HDF5_INCLUDE_DIR has been deprecated some time ago,
only HDF5_INCLUDE_DIRS is set for CMake >= 3.6.0.
2016-08-28 15:26:35 +02:00
Dennis Heimbigner
0cf1e2c49f re: Github issue netcdf-c 300
Modified provenance code to allocate the minimal space
needed for _NCProperties attribute in file.  Basically
required using malloc in the provenance code and in ncdump.
Otherwise should cause no externally visible effects.
Also removed the ENABLE_FILEINFO from configure.ac since
the provenance code is no longer optional.
2016-08-08 09:24:19 -06:00
Ward Fisher
a4189e9dd3 Bumped SO version. 2016-06-28 13:33:12 -06:00
Ward Fisher
b2b8499f53 Got distcheck working, corrected some parallel test logic in cmakelists. 2016-06-09 13:21:28 -06:00
Bas Couwenberg
aa8f23c5bb Use SOURCE_DATE_EPOCH instead of current date.
The environment variable is used to support Reproducible Builds.

https://reproducible-builds.org/specs/source-date-epoch/
2016-05-15 17:20:18 +02:00
Ward Fisher
287e73ca26 Bumping SO Version correctly. 2016-05-13 11:51:57 -06:00
Ward Fisher
10f85caf26 Rolled back SO version to 11 after incorrectly bumping it in the 4.4.1 rc1 release. 2016-05-12 16:04:04 -06:00
Dennis Heimbigner
b4dc1dca19 More cmake fixes 2016-05-07 14:32:07 -06:00
Dennis Heimbigner
a4dea6bf83 Again, forgot to fix CMakeLists.txt
to match configure.ac (sigh!).
ENABLE_FILEINFO should be
enabled iff NETCDF4 is enabled.
2016-05-07 14:32:07 -06:00
Dennis Heimbigner
11a259ad86 Add provenance info for netcdf-4 files.
This consists of a persistent attribute named
_NCProperties plus two computed attributes
_IsNetcdf4 and _SuperblockVersion.
See the 'Provenance Attributes' section
of docs/attribute_conventions.md for details.
2016-05-07 14:32:07 -06:00
Ward Fisher
3f773258bd Corrected an issue with hashmap and missing random() function on Windows using Visual Studio 2013 2016-04-11 16:07:27 -06:00
Ward Fisher
83f1e01409 SOVersion Bump. 2016-04-11 09:59:24 -06:00
Ward Fisher
493a6e5d62 Found pre-existing call to H5Pset_libver_bounds, modified it so that the generated files would be created without the 1.10 specific things. 2016-04-08 21:36:08 +00:00
Ward Fisher
fc49992012 Added check to cmake for H5Pset_libver_bounds 2016-04-08 21:13:33 +00:00
Ward Fisher
719ddac946 Adding cmake infrastructure in support of https://github.com/Unidata/netcdf-c/issues/228 2016-03-07 14:04:52 -07:00
Ward Fisher
b19b807e8b Working around a couple of problematic calls to fstat in support of https://github.com/Unidata/netcdf-c/issues/188 . No idea why these were a problem in VS14 (Visual Studio 2015) and not in VS12 (Visual Studio 2013). It's possible there are other, similar issues out there. We'll see what turns up when we run all the tests. These changes were tested against nc_test4/tst_large2.c 2016-03-02 13:03:29 -07:00
Ward Fisher
c08ae9b7b6 Merge branch 'patch-10' of https://github.com/gsjaardema/netcdf-c into merge 2016-02-23 16:32:59 -07:00
Ward Fisher
1c1141d43e Added missing install for cmake-based builds, netcdf_mem.h. Also, moved install directives for header files into include/CMakeLists.txt. This is in support of https://github.com/Unidata/netcdf-c/issues/227 2016-02-23 18:12:16 +00:00
Greg Sjaardema
2da555a2d5 Fix setting of HDF5 include directory path when explicitly specified
The HDF5 include directory needs to be updated when explicitly setting the HDF5 libraries and include path.  This is done on line 561 when FindPackage finds the hdf5 libraries, but was not being done in the manual setting.
2016-02-22 10:54:37 -07:00
Greg Sjaardema
ebc25610ef Merge branch 'master' into patch-5 2016-02-09 13:43:06 -07:00
Greg Sjaardema
126a319230 Fix version dependency.
Required PNetCDF version is 1.6.1 or greater; not 1.6.0 as I previously thought.

Note that this is pull request may (partially) satisfy Issue #194 which I just found.
2016-02-09 11:23:33 -07:00
Greg Sjaardema
d123157771 Enable PNetCDF settings in cmake build
One possible solution to finding the PNetCDF library and testing for the correct version in the cmake build.
2016-02-09 07:23:09 -07:00
Greg Sjaardema
df58364f00 Support user-specified hdf5 and hdf5_hl libraries
If the netcdf cmake build is configured with explicitly specified hdf5 c and hl libraries:
```
    -DHDF5_C_LIBRARY:PATH=${ACCESS}/lib/libhdf5.dylib \
    -DHDF5_HL_LIBRARY:PATH=${ACCESS}/lib/libhdf5_hl.dylib \
    -DHDF5_INCLUDE_DIR:PATH=${ACCESS}/include \
```
Then it looks like the HDF5_C_LIBRARIES and HDF5_HL_LIBRARIES variables do not get set and then this causes the HDF5 libraries to be omitted from the `TLL_LIBS` symbol in liblib/CMakeLists.txt.  This is subsequently used to build `ALL_TLL_LIBS` which is used for `LIBS` which is output as the `Extra libraries:        @LIBS@` in libnetcdf.settings.in 

The output for `-- Linking against:` is also incorrect as it omits the hdf5 libraries:   Output without suggested change:
```
-- Linking against:      /usr/lib/libdl.dylib;/usr/lib/libm.dylib;/opt/local/lib/libz.dylib;/opt/local/lib/libcurl.dylib
(later in file)
Extra libraries:	-ldl -lm -lz -lcurl
```
versus output with suggested change:
```
-- Linking against:      /Users/gdsjaar/src/seacas-parallel/lib/libhdf5_hl.dylib;/Users/gdsjaar/src/seacas-parallel/lib/libhdf5.dylib;/usr/lib/libdl.dylib;/usr/lib/libm.dylib;/opt/local/lib/libz.dylib;/opt/local/lib/libcurl.dylib
(later in file)
Extra libraries:	-lhdf5_hl -lhdf5 -ldl -lm -lz -lcurl
```
This also causes a link failure when building libnetcdf.dylib
2016-02-08 17:20:48 -07:00
Ward Fisher
79c021712a Removed generated tests from source control. Ensuring generated files are regenerated if m4 is present. 2016-01-22 12:03:28 -07:00
Ward Fisher
60644f3c4c Bumped next development version. 2016-01-13 10:01:34 -07:00
Ward Fisher
d11ed3c478 Bumped SO version in CMakeLists.txt 2016-01-11 15:27:57 -07:00
Ward Fisher
6867960a0c Removed debugging information. 2016-01-08 12:59:56 -07:00
Ward Fisher
65aaac62d8 Tweaked CMakeLists a bit more. 2016-01-08 12:59:37 -07:00
Ward Fisher
60ef454a7f Refactoring CMakeLists.txt to make the HDF5-related logic a little more clear. Or at least, better documented. 2016-01-08 10:56:25 -07:00