Mercurial > forge
changeset 12475:bd19fcb73c05 octave-forge
remove NC_INDEPENDENT and NC_COLLECTIVE which are no longer defined in netcdf 4.3.1
| author | abarth93 |
|---|---|
| date | Thu, 08 May 2014 08:45:25 +0000 |
| parents | 01093720816e |
| children | ace0f38cbddf |
| files | main/netcdf/DESCRIPTION main/netcdf/NEWS main/netcdf/src/Makefile main/netcdf/src/netcdf_constants.awk main/netcdf/src/netcdf_constants.h |
| diffstat | 5 files changed, 22 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/main/netcdf/DESCRIPTION Sun May 04 20:01:21 2014 +0000 +++ b/main/netcdf/DESCRIPTION Thu May 08 08:45:25 2014 +0000 @@ -1,6 +1,6 @@ Name: netcdf -Version: 1.0.2 -Date: 2014-02-17 +Version: 1.0.3 +Date: 2014-05-08 Author: Alexander Barth <barth.alexander@gmail.com> Maintainer: Alexander Barth <barth.alexander@gmail.com> Title: netcdf
--- a/main/netcdf/NEWS Sun May 04 20:01:21 2014 +0000 +++ b/main/netcdf/NEWS Thu May 08 08:45:25 2014 +0000 @@ -1,3 +1,10 @@ +Summary of important user-visible changes for netcdf 1.0.3: +------------------------------------------------------------------- + + ** remove NC_INDEPENDENT and NC_COLLECTIVE which are no longer defined + in netcdf 4.3.1 + + Summary of important user-visible changes for netcdf 1.0.2: -------------------------------------------------------------------
--- a/main/netcdf/src/Makefile Sun May 04 20:01:21 2014 +0000 +++ b/main/netcdf/src/Makefile Thu May 08 08:45:25 2014 +0000 @@ -3,8 +3,8 @@ MKOCTFILE=mkoctfile OCTAVE=octave NCHEADER=$(shell nc-config --includedir)/netcdf.h -#SRC=netcdf_package.cc SRC=__netcdf__.cc +CFLAGS=$(shell nc-config --cflags) all: __netcdf__.oct @@ -18,7 +18,7 @@ rm ../PKG_ADD ../inst/import_netcdf.m __netcdf__.oct: $(SRC) netcdf_constants.h - $(MKOCTFILE) $(SRC) $(LIBS) + $(MKOCTFILE) $(CFLAGS) $(SRC) $(LIBS) ../PKG_ADD: $(SRC) sh PKG_ADD.sh
--- a/main/netcdf/src/netcdf_constants.awk Sun May 04 20:01:21 2014 +0000 +++ b/main/netcdf/src/netcdf_constants.awk Thu May 08 08:45:25 2014 +0000 @@ -16,13 +16,21 @@ # Generate the list of NetCDF constants based on the header file netcdf.h BEGIN { - print "// DO NOT EDIT -- generated by netcdf_constants.awk"; + print "// generated by netcdf_constants.awk"; } /\#define[ \t]+NC_[0-9a-zA-Z_]*[ \t]+/ { constant=$2; ov = constant; - if ($0 ~ /.*internally.*/ || constant == "NC_TURN_OFF_LOGGING") { + + # NC_INDEPENDENT and NC_COLLECTIVE are no longer defined + # in netcdf 4.3.1 + + if ($0 ~ /.*internally.*/ || \ + constant == "NC_TURN_OFF_LOGGING" || \ + constant == "NC_INDEPENDENT" || \ + constant == "NC_COLLECTIVE" \ + ) { next; }
--- a/main/netcdf/src/netcdf_constants.h Sun May 04 20:01:21 2014 +0000 +++ b/main/netcdf/src/netcdf_constants.h Thu May 08 08:45:25 2014 +0000 @@ -1,4 +1,4 @@ -// DO NOT EDIT -- generated by netcdf_constants.awk +// generated by netcdf_constants.awk netcdf_constants["NC_NAT"] = octave_value(NC_NAT); netcdf_constants["NC_BYTE"] = octave_value(NC_BYTE); netcdf_constants["NC_CHAR"] = octave_value(NC_CHAR); @@ -151,8 +151,6 @@ netcdf_constants["NC_EBADCHUNK"] = octave_value(NC_EBADCHUNK); netcdf_constants["NC_ENOTBUILT"] = octave_value(NC_ENOTBUILT); netcdf_constants["NC_HAVE_NEW_CHUNKING_API"] = octave_value(NC_HAVE_NEW_CHUNKING_API); - netcdf_constants["NC_INDEPENDENT"] = octave_value(NC_INDEPENDENT); - netcdf_constants["NC_COLLECTIVE"] = octave_value(NC_COLLECTIVE); netcdf_constants["NC_ENTOOL"] = octave_value(NC_ENTOOL); netcdf_constants["NC_EXDR"] = octave_value(NC_EXDR); netcdf_constants["NC_SYSERR"] = octave_value(NC_SYSERR);