Commit Graph

24 Commits

Author SHA1 Message Date
Ward Fisher
d14b7e01c0 Fixed shell script typo. 2017-10-16 10:06:46 -06:00
Ward Fisher
d432dc4083 Correcting typos. 2017-10-16 09:55:47 -06:00
Ward Fisher
d0c21662ec Corrected an incomplete merge. 2017-10-16 09:47:57 -06:00
Ward Fisher
bd510c33a8 Added help messages to nc-config for the new --has-parallel flag. 2017-10-16 09:40:59 -06:00
Ward Fisher
1e0c260234 Merge branch 'patch-3' of https://github.com/gsjaardema/netcdf-c into has-parallel 2017-10-16 09:36:52 -06:00
Ward Fisher
3c61d86367 Syntax corrections. 2017-09-26 14:01:21 -06:00
Greg Sjaardema
7bec2daa14 Add --is-parallel option and output to nc-config
It is useful to be able to determine whether the netcdf library has parallel capabilities enabled.  Currently can look at netcdf_meta.h, but would be useful be able to get information from nc-config since that is how most other options settings are displayed.
2017-09-26 10:57:32 -06:00
Ward Fisher
62c709fe54 Added --has-cdf5 to nc-config, cmake generated. 2017-09-18 14:24:54 -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
Greg Sjaardema
076d71e888 Fix (I think) the --has-dap and --has-dap4 output
The `has_dap4` define was missing trailing @.  I also added tests similar to other code to result in lowercase yes no for `--has_dap4`.

I'm not as sure about the `--has-dap` changes.  One place was outputting `$has_dap` which is never defined.  I think that the intent is that `--has-dap` returns the same as `--has-dap2` so made changes that did that.  If that isn't the intent, then let me know and I will back out those changes and only leave the dap4-related change.
2017-08-29 15:27:39 -06:00
Peter Hill
2fec785794 Fix method of finding ncxx[4]-config for non-bash shells
`type -p` is a bashism, and might not work with other shells
2017-05-30 11:13:27 +01: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
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
a5b595e974 Removed stray info lines in nc-config templates. 2016-11-01 10:47:17 -06:00
Peter Hill
d455718f40 Usage function called wrong in nc-config
`usage` needs to be called with an exit value. Incorrect options won't
set the exit value, so are trickier to detect
2016-08-18 16:48:30 +01:00
Peter Hill
6c028fbf5c Get C++ flags from ncxx{4}-config 2016-08-17 14:45:40 +01:00
Peter Hill
ce15b1cc2d Add couple of missing flags to nc-config
- Add --has-fortran, in addition to the specific --has-f90, --has-f03
- Add --libdir to print just the libdir
- Also 'which nf-config' will spit out errors if nf-config is not found.
  Silence these errors
2016-08-17 14:45:05 +01:00
Ward Fisher
05cbb8444b Propegated previous change into cmake-based builds. 2016-07-27 14:10:05 -06:00
Peter Hill
3c7109dd59 Use cmake libdir, includedir variables in nc-config 2016-03-10 16:13:29 +00:00
Ward Fisher
2206527ba5 Wired logging status into nc-config generated by cmake. 2016-02-29 11:32:26 -07:00
Ward Fisher
6f06fb71da Modified nc-config to reflect value of --has-f03 when netcdf-fortran is found, and also added '--enable-logging' to determine if netcdf-c was built with logging enabled. 2016-02-29 11:24:46 -07:00
Greg Sjaardema
e8280efcb2 Generate correct results from cmake-generated nc-config
A couple of the `has_XX` variables seem to have values of OFF or ON instead of `empty` or ON which causes incorrect output from the nc-config script since it is using `-z` to test whether the variable is non-empty.  This causes nc-config to incorrectly report that the library supports HDF5 or has the version 2 api.
2016-02-10 15:03:19 -07:00
Ward Fisher
fc97546113 Updated nc-config.cmake.in to work with Windows-style paths. Further changes to get shell scripts running in Windows, when bash is available. 2015-02-02 14:46:51 -07:00
Ward Fisher
94fda7630b Made template naming convention more uniform. 2014-05-29 13:23:24 -06:00