Hello community,
here is the log from the commit of package octave-forge-netcdf for
openSUSE:Factory checked in at 2018-06-29 22:26:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-netcdf (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-netcdf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-netcdf"
Fri Jun 29 22:26:02 2018 rev:4 rq:616564 version:1.0.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/octave-forge-netcdf/octave-forge-netcdf.changes
2016-06-14 23:07:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.octave-forge-netcdf.new/octave-forge-netcdf.changes
2018-06-29 22:26:04.362498442 +0200
@@ -1,0 +2,6 @@
+Wed Jun 6 08:42:51 UTC 2018 - [email protected]
+
+- Update to version 1.0.12:
+ * Fix bug #51443: configure in dev octave 4.3.0+
+
+-------------------------------------------------------------------
Old:
----
netcdf-1.0.11.tar.gz
New:
----
netcdf-1.0.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-netcdf.spec ++++++
--- /var/tmp/diff_new_pack.HNNrXt/_old 2018-06-29 22:26:04.814498101 +0200
+++ /var/tmp/diff_new_pack.HNNrXt/_new 2018-06-29 22:26:04.822498095 +0200
@@ -1,7 +1,7 @@
#
# spec file for package octave-forge-netcdf
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,10 +18,10 @@
%define octpkg netcdf
Name: octave-forge-%{octpkg}
-Version: 1.0.11
+Version: 1.0.12
Release: 0
Summary: NetCDF interface for Octave
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Scientific/Math
Url: http://octave.sourceforge.net
Source0:
http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
++++++ netcdf-1.0.11.tar.gz -> netcdf-1.0.12.tar.gz ++++++
++++ 3158 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/.travis.yml new/netcdf-1.0.12/.travis.yml
--- old/netcdf/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/.travis.yml 2018-04-12 17:00:38.000000000 +0200
@@ -0,0 +1,7 @@
+language: cpp
+sudo: required
+dist: trusty
+before_install:
+ - sudo apt-get -qq update
+ - sudo apt-get install -y octave liboctave-dev libnetcdf-dev netcdf-bin
+script: cd ..; mv octave-netcdf netcdf; octave --eval 'pkg install netcdf; pkg
load netcdf; test_netcdf'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/DESCRIPTION new/netcdf-1.0.12/DESCRIPTION
--- old/netcdf/DESCRIPTION 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/DESCRIPTION 2018-04-12 17:00:38.000000000 +0200
@@ -1,12 +1,12 @@
Name: netcdf
-Version: 1.0.11
-Date: 2016-05-19
+Version: 1.0.12
+Date: 2018-04-12
Author: Alexander Barth <[email protected]>
-Maintainer: Alexander Barth <[email protected]>
+Maintainer: Alexander Barth <[email protected]>, John Donoghue
<[email protected]>
Title: netcdf
-Description: A MATLAB compatible NetCDF interface for Octave
+Description: A NetCDF interface for Octave
Depends: octave (>= 3.4.0)
BuildRequires: netcdf-devel [Fedora]
-BuildRequires: libnetcdf-dev [Debian], netcdf-bin [Debian]
+ libnetcdf-dev [Debian], netcdf-bin [Debian]
License: GPLv2+
-Url: http://modb.oce.ulg.ac.be/mediawiki/index.php/Octave-netcdf,
http://octave.sf.net
+Url: https://github.com/Alexander-Barth/octave-netcdf/wiki,
http://octave.sf.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/Makefile new/netcdf-1.0.12/Makefile
--- old/netcdf/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/Makefile 2018-04-12 17:00:38.000000000 +0200
@@ -0,0 +1,241 @@
+## Copyright 2015-2016 Carnë Draug
+## Copyright 2015-2016 Oliver Heimlich
+## Copyright 2017 Julien Bect <[email protected]>
+## Copyright 2017 Olaf Till <[email protected]>
+## Copyright 2018 John Donoghue <[email protected]>
+##
+## Copying and distribution of this file, with or without modification,
+## are permitted in any medium without royalty provided the copyright
+## notice and this notice are preserved. This file is offered as-is,
+## without any warranty.
+
+## Some basic tools (can be overriden using environment variables)
+SED ?= sed
+TAR ?= tar
+GREP ?= grep
+CUT ?= cut
+TR ?= tr
+
+## Note the use of ':=' (immediate set) and not just '=' (lazy set).
+## http://stackoverflow.com/a/448939/1609556
+package := $(shell $(GREP) "^Name: " DESCRIPTION | $(CUT) -f2 -d" " | \
+$(TR) '[:upper:]' '[:lower:]')
+version := $(shell $(GREP) "^Version: " DESCRIPTION | $(CUT) -f2 -d" ")
+
+## These are the paths that will be created for the releases.
+target_dir := target
+release_dir := $(target_dir)/$(package)-$(version)
+release_tarball := $(target_dir)/$(package)-$(version).tar.gz
+html_dir := $(target_dir)/$(package)-html
+html_tarball := $(target_dir)/$(package)-html.tar.gz
+## Using $(realpath ...) avoids problems with symlinks due to bug
+## #50994 in Octaves scripts/pkg/private/install.m. But at least the
+## release directory above is needed in the relative form, for 'git
+## archive --format=tar --prefix=$(release_dir).
+real_target_dir := $(realpath .)/$(target_dir)
+installation_dir := $(real_target_dir)/.installation
+package_list := $(installation_dir)/.octave_packages
+install_stamp := $(installation_dir)/.install_stamp
+
+## These can be set by environment variables which allow to easily
+## test with different Octave versions.
+ifndef OCTAVE
+OCTAVE := octave
+endif
+OCTAVE := $(OCTAVE) --no-gui --silent --norc
+MKOCTFILE ?= mkoctfile
+
+## Command used to set permissions before creating tarballs
+FIX_PERMISSIONS ?= chmod -R a+rX,u+w,go-w,ug-s
+
+## Detect which VCS is used
+vcs := $(if $(wildcard .hg),hg,$(if $(wildcard .git),git,unknown))
+ifeq ($(vcs),hg)
+release_dir_dep := .hg/dirstate
+endif
+ifeq ($(vcs),git)
+release_dir_dep := .git/index
+endif
+
+
+## .PHONY indicates targets that are not filenames
+## (https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html)
+.PHONY: help
+
+## make will display the command before runnning them. Use @command
+## to not display it (makes specially sense for echo).
+help:
+ @echo "Targets:"
+ @echo " dist - Create $(release_tarball) for release."
+ @echo " html - Create $(html_tarball) for release."
+ @echo " release - Create both of the above and show md5sums."
+ @echo " install - Install the package in $(installation_dir), where
it is not visible in a normal Octave session."
+ @echo " check - Execute package tests."
+ @echo " doctest - Test the help texts with the doctest package."
+ @echo " run - Run Octave with the package installed in
$(installation_dir) in the path."
+ @echo " clean - Remove everything made with this Makefile."
+
+
+##
+## Recipes for release tarballs (package + html)
+##
+
+.PHONY: release dist html clean-tarballs clean-unpacked-release
+
+## To make a release, build the distribution and html tarballs.
+release: dist html
+ md5sum $(release_tarball) $(html_tarball)
+ @echo "Upload @ https://sourceforge.net/p/octave/package-releases/new/";
+ @echo " and note the changeset the release corresponds to"
+
+## dist and html targets are only PHONY/alias targets to the release
+## and html tarballs.
+dist: $(release_tarball)
+html: $(html_tarball)
+
+## An implicit rule with a recipe to build the tarballs correctly.
+%.tar.gz: %
+ $(TAR) -c -f - --posix -C "$(target_dir)/" "$(notdir $<)" | gzip -9n >
"$@"
+
+clean-tarballs:
+ @echo "## Cleaning release tarballs (package + html)..."
+ -$(RM) $(release_tarball) $(html_tarball)
+ @echo
+
+## Create the unpacked package.
+##
+## Notes:
+## * having ".hg/dirstate" (or ".git/index") as a prerequesite means it is
+## only rebuilt if we are at a different commit.
+## * the variable RM usually defaults to "rm -f"
+## * having this recipe separate from the one that makes the tarball
+## makes it easy to have packages in alternative formats (such as zip)
+## * note that if a commands needs to be run in a specific directory,
+## the command to "cd" needs to be on the same line. Each line restores
+## the original working directory.
+$(release_dir): $(release_dir_dep)
+ -$(RM) -r "$@"
+ifeq (${vcs},hg)
+ hg archive --exclude ".hg*" --type files "$@"
+endif
+ifeq (${vcs},git)
+ git archive --format=tar --prefix="$@/" HEAD | $(TAR) -x
+ $(RM) "$@/.gitignore"
+endif
+## Don't fall back to run the supposed necessary contents of
+## 'bootstrap' here. Users are better off if they provide
+## 'bootstrap'. Administrators, checking build reproducibility, can
+## put in the missing 'bootstrap' file if they feel they know its
+## necessary contents.
+ifneq (,$(wildcard src/autogen.sh))
+ cd "$@/src" && ./autogen.sh && $(RM) -r "autom4te.cache"
+endif
+## Uncomment this if your src/Makefile.in has these targets for
+## pre-building something for the release (e.g. documentation).
+# cd "$@/src" && ./configure && $(MAKE) prebuild && \
+# $(MAKE) distclean && $(RM) Makefile
+##
+ ${FIX_PERMISSIONS} "$@"
+
+run_in_place = $(OCTAVE) --eval ' pkg ("local_list", "$(package_list)"); ' \
+ --eval ' pkg ("load", "$(package)"); '
+
+# html_options = --eval 'options = get_html_options ("octave-forge");'
+## Uncomment this for package documentation.
+html_options = --eval 'options = get_html_options ("octave-forge");'
+#html_options = --eval 'options = get_html_options ("octave-forge");' \
+# --eval 'options.package_doc = "$(package).texi";'
+$(html_dir): $(install_stamp)
+ $(RM) -r "$@";
+ $(run_in_place) \
+ --eval ' pkg load generate_html; ' \
+ $(html_options) \
+ --eval ' generate_package_html ("$(package)", "$@", options); ';
+ $(FIX_PERMISSIONS) "$@";
+
+clean-unpacked-release:
+ @echo "## Cleaning unpacked release tarballs (package + html)..."
+ -$(RM) -r $(release_dir) $(html_dir)
+ @echo
+
+##
+## Recipes for installing the package.
+##
+
+.PHONY: install clean-install
+
+octave_install_commands = \
+' llist_path = pkg ("local_list"); \
+ mkdir ("$(installation_dir)"); \
+ load (llist_path); \
+ local_packages(cellfun (@ (x) strcmp ("$(package)", x.name),
local_packages)) = []; \
+ save ("$(package_list)", "local_packages"); \
+ pkg ("local_list", "$(package_list)"); \
+ pkg ("prefix", "$(installation_dir)", "$(installation_dir)"); \
+ pkg ("install", "-local", "-verbose", "$(release_tarball)"); '
+
+## Install unconditionally. Maybe useful for testing installation with
+## different versions of Octave.
+install: $(release_tarball)
+ @echo "Installing package under $(installation_dir) ..."
+ $(OCTAVE) --eval $(octave_install_commands)
+ touch $(install_stamp)
+
+## Install only if installation (under target/...) is not current.
+$(install_stamp): $(release_tarball)
+ @echo "Installing package under $(installation_dir) ..."
+ $(OCTAVE) --eval $(octave_install_commands)
+ touch $(install_stamp)
+
+clean-install:
+ @echo "## Cleaning installation under $(installation_dir) ..."
+ -$(RM) -r $(installation_dir)
+ @echo
+
+
+##
+## Recipes for testing purposes
+##
+
+.PHONY: run doctest check
+
+## Start an Octave session with the package directories on the path for
+## interactice test of development sources.
+run: $(install_stamp)
+ $(run_in_place) --persist
+
+## Test example blocks in the documentation. Needs doctest package
+## https://octave.sourceforge.io/doctest/index.html
+doctest: $(install_stamp)
+ $(run_in_place) --eval 'pkg load doctest;'
\
+ --eval "targets = '$(shell (cd inst && ls *.m) | $(CUT) -f2 -d@ |
$(CUT) -f1 -d.)';" \
+ --eval "targets = strsplit (targets, ' '); doctest (targets);"
+
+
+## Test package.
+octave_test_commands = \
+' dirs = {"inst", "src"}; \
+ dirs(cellfun (@ (x) ! isdir (x), dirs)) = []; \
+ if (isempty (dirs)) error ("no \"inst\" or \"src\" directory"); exit (1); \
+ else __run_test_suite__ (dirs, {}); endif '
+## the following works, too, but provides no overall summary output as
+## __run_test_suite__ does:
+##
+## else cellfun (@runtests, horzcat (cellfun (@ (dir) ostrsplit (([~, dirs]
= system (sprintf ("find %s -type d", dir))), "\n\r", true), dirs,
"UniformOutput", false){:})); endif '
+check: $(install_stamp)
+ $(run_in_place) --eval $(octave_test_commands)
+
+
+##
+## CLEAN
+##
+
+.PHONY: clean
+
+clean: clean-tarballs clean-unpacked-release clean-install
+ @echo "## Removing target directory (if empty)..."
+ -rmdir $(target_dir)
+ @echo
+ @echo "## Cleaning done"
+ @echo
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/NEWS new/netcdf-1.0.12/NEWS
--- old/netcdf/NEWS 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/NEWS 2018-04-12 17:00:38.000000000 +0200
@@ -1,3 +1,8 @@
+Summary of important user-visible changes for netcdf 1.0.12:
+-------------------------------------------------------------------
+
+ ** Fix bug #51443: configure in dev octave 4.3.0+
+
Summary of important user-visible changes for netcdf 1.0.11:
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/README.md new/netcdf-1.0.12/README.md
--- old/netcdf/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/README.md 2018-04-12 17:00:38.000000000 +0200
@@ -0,0 +1,10 @@
+[](https://travis-ci.org/Alexander-Barth/octave-netcdf)
+
+# octave-netcdf
+A NetCDF interface for Octave
+
+Releases: https://octave.sourceforge.io/netcdf/
+
+Documentation: https://octave.sourceforge.io/netcdf/overview.html
+
+Wiki: https://github.com/Alexander-Barth/octave-netcdf/wiki
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/inst/test_netcdf.m new/netcdf-1.0.12/inst/test_netcdf.m
--- old/netcdf/inst/test_netcdf.m 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/inst/test_netcdf.m 2018-04-12 17:00:38.000000000
+0200
@@ -37,7 +37,7 @@
end
end
-%% Copyright (C) 2013 Alexander Barth
+%% Copyright (C) 2013-2018 Alexander Barth
%%
%% This program is free software; you can redistribute it and/or modify
%% it under the terms of the GNU General Public License as published by
@@ -52,6 +52,9 @@
%% You should have received a copy of the GNU General Public License
%% along with this program; If not, see <http://www.gnu.org/licenses/>.
+%!test
+%! fprintf ("\n");
+%! test_netcdf ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/Makeconf.in new/netcdf-1.0.12/src/Makeconf.in
--- old/netcdf/src/Makeconf.in 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/Makeconf.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-
-## Makeconf is automatically generated from Makeconf.base and Makeconf.add
-## in the various subdirectories. To regenerate, use ./autogen.sh to
-## create a new ./Makeconf.in, then use ./configure to generate a new
-## Makeconf.
-
-OCTAVE_FORGE = 1
-
-SHELL = @SHELL@
-
-canonical_host_type = @canonical_host_type@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-mandir = @mandir@
-libdir = @libdir@
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-datarootdir = @datarootdir@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALLOCT=octinst.sh
-
-DESTDIR =
-
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-LN_S = @LN_S@
-
-AWK = @AWK@
-
-# Most octave programs will be compiled with $(MKOCTFILE). Those which
-# cannot use mkoctfile directly can request the flags that mkoctfile
-# would use as follows:
-# FLAG = $(shell $(MKOCTFILE) -p FLAG)
-# # The following flags are for compiling programs that are independent
-# # of Octave. How confusing.
-# CC = @CC@
-# CFLAGS = @CFLAGS@
-# CPPFLAGS = @CPPFLAGS@
-# CPICFLAG = @CPICFLAG@
-# CXX = @CXX@
-# CXXFLAGS = @CXXFLAGS@
-# CXXPICFLAG = @CXXPICFLAG@
-# F77 = @F77@
-# FFLAGS = @FFLAGS@
-# FPICFLAG = @FPICFLAG@
-
-OCTAVE = @OCTAVE@
-OCTAVE_VERSION = @OCTAVE_VERSION@
-MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
-SHLEXT = @SHLEXT@
-NC_CONFIG = @NC_CONFIG@
-OCTAVE_CONFIG = @OCTAVE_CONFIG@
-
-%.o: %.c ; $(MKOCTFILE) -c $<
-%.o: %.f ; $(MKOCTFILE) -c $<
-%.o: %.cc ; $(MKOCTFILE) -c $<
-%.oct: %.cc ; $(MKOCTFILE) $<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/Makefile new/netcdf-1.0.12/src/Makefile
--- old/netcdf/src/Makefile 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-sinclude Makeconf
-
-AWK ?= awk
-MKOCTFILE ?= mkoctfile
-OCTAVE ?= octave
-NC_CONFIG ?= nc-config
-NCHEADER=$(shell $(NC_CONFIG) --includedir)/netcdf.h
-SRC=__netcdf__.cc
-CFLAGS=$(shell $(NC_CONFIG) --cflags)
-LIBS=$(shell $(NC_CONFIG) --libs)
-
-all: __netcdf__.oct
-
-constants:
- $(AWK) -f netcdf_constants.awk $(NCHEADER) > netcdf_constants.h
-
-clean:
- rm -f __netcdf__.o __netcdf__.oct
-
-real-clean: clean
- rm -f ../PKG_ADD ../inst/import_netcdf.m
-
-__netcdf__.oct: $(SRC) netcdf_constants.h
- $(MKOCTFILE) $(CFLAGS) $(SRC) $(LIBS)
-
-../PKG_ADD: $(SRC)
- sh PKG_ADD.sh
-
-check: ../PKG_ADD __netcdf__.oct
- ($(OCTAVE) -f --eval "pkg unload octcdf; addpath $$PWD; addpath
$$PWD/../inst; test_netcdf")
-
-check2: ../PKG_ADD __netcdf__.oct
- ($(OCTAVE) -f --eval "addpath $$PWD; addpath $$PWD/../inst;
test_netcdf")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/PKG_ADD.sh new/netcdf-1.0.12/src/PKG_ADD.sh
--- old/netcdf/src/PKG_ADD.sh 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/PKG_ADD.sh 2018-04-12 17:00:38.000000000 +0200
@@ -13,9 +13,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; If not, see <http://www.gnu.org/licenses/>.
+if [ "x$AWK" = "x" ]; then
+ AWK=awk
+fi
-
-netcdf_functions=$(awk -F'[(,]' '/DEFUN_DLD/ { print $2 } ' __netcdf__.cc)
+netcdf_functions=$($AWK -F'[(,]' '/DEFUN_DLD/ { print $2 } ' __netcdf__.cc)
outfile=../PKG_ADD
outfile_del=../PKG_DEL
@@ -27,7 +29,7 @@
echo '% File automatically generated by PKG_ADD.sh' > $outfile
for i in $netcdf_functions; do
- echo ${i#netcdf_}
+ #echo ${i#netcdf_}
cat >> $outfile <<EOF
autoload ("$i", fullfile (fileparts (mfilename ("fullpath")),
"__netcdf__.oct"));
EOF
@@ -41,7 +43,7 @@
echo '% File automatically generated by PKG_ADD.sh' > $outfile_del
for i in $netcdf_functions; do
- echo ${i#netcdf_}
+ #echo ${i#netcdf_}
cat >> $outfile_del <<EOF
autoload ("$i", fullfile (fileparts (mfilename ("fullpath")),
"__netcdf__.oct"),"remove");
EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/__netcdf__.cc new/netcdf-1.0.12/src/__netcdf__.cc
--- old/netcdf/src/__netcdf__.cc 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/__netcdf__.cc 2018-04-12 17:00:38.000000000 +0200
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Alexander Barth <[email protected]>
+// Copyright (C) 2013-2018 Alexander Barth <[email protected]>
//
// This program is free software; you can redistribute it and/or modify it
under
// the terms of the GNU General Public License as published by the Free
Software
@@ -26,6 +26,8 @@
#include <vector>
#include <inttypes.h>
+#include "config.h"
+
// Octave constructor to hold an array of ints
#define NETCDF_INT_ARRAY int32NDArray
std::map<std::string, octave_value> netcdf_constants;
@@ -699,7 +701,7 @@
Array<double> tmp;
- if (!args(3).is_empty()) {
+ if (!args(3).OV_ISEMPTY()) {
tmp = args(3).vector_value ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/autogen.sh new/netcdf-1.0.12/src/autogen.sh
--- old/netcdf/src/autogen.sh 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/autogen.sh 2018-04-12 17:00:38.000000000 +0200
@@ -1,25 +1,9 @@
#! /bin/sh
-## Generate ./configure
-rm -f configure.in
-echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" >
configure.in
-cat configure.base >> configure.in
-cat <<EOF >> configure.in
- AC_OUTPUT(\$CONFIGURE_OUTPUTS)
- dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions
+## Generate ./configure and other build files
+aclocal
+autoconf
+autoheader -f
- echo " "
- echo " \"\\\$prefix\" is \$prefix"
- echo " \"\\\$exec_prefix\" is \$exec_prefix"
- AC_MSG_RESULT([\$STATUS_MSG
-])
-EOF
-
-autoconf configure.in > configure.tmp
-if [ diff configure.tmp configure > /dev/null 2>&1 ]; then
- rm -f configure.tmp;
-else
- mv -f configure.tmp configure
- chmod 0755 configure
-fi
-rm -f configure.in
+#rm -f configure.ac
+rm -rf autom4te.cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/config.h.in new/netcdf-1.0.12/src/config.h.in
--- old/netcdf/src/config.h.in 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/src/config.h.in 2018-04-16 22:33:18.968544246 +0200
@@ -0,0 +1,26 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+#include "undef-ah-octave.h"
+
+/* macro for alternative Octave symbols */
+#undef OV_ISEMPTY
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+#include "oct-alt-includes.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/configure.ac new/netcdf-1.0.12/src/configure.ac
--- old/netcdf/src/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/src/configure.ac 2018-04-12 17:00:38.000000000 +0200
@@ -0,0 +1,105 @@
+dnl The configure script is generated by autogen.sh from configure.base
+dnl and the various configure.add files in the source tree. Edit
+dnl configure.base and reprocess rather than modifying ./configure.
+
+dnl autoconf 2.13 certainly doesn't work! What is the minimum requirement?
+AC_PREREQ(2.2)
+
+AC_INIT([octave netcdf package],[1.0.12])
+AC_CONFIG_HEADERS([config.h])
+
+# Avoid warnings for redefining AH-generated preprocessor symbols of
+# Octave.
+AH_TOP([#include "undef-ah-octave.h"])
+
+AC_CONFIG_MACRO_DIRS([m4])
+
+dnl Kill caching --- this ought to be the default
+define([AC_CACHE_LOAD], )dnl
+define([AC_CACHE_SAVE], )dnl
+
+dnl uncomment to put support files in another directory
+dnl AC_CONFIG_AUX_DIR(admin)
+
+dnl if tools we need
+AC_PROG_AWK
+AC_PROG_CXX
+AC_LANG(C++)
+
+
+dnl Check for mkoctfile and octave
+AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
+test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
+
+AC_CHECK_PROG(OCTAVE,octave,octave)
+
+dnl **********************************************************
+dnl checking for nc-config
+
+dnl AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config)
+AC_CHECK_TOOL(NC_CONFIG, nc-config, [])
+if test -z "$NC_CONFIG"; then
+ AC_MSG_ERROR([nc-config not found], 1);
+fi
+
+NETCDF_LIBS=`$NC_CONFIG --libs`
+NETCDF_CPPFLAGS=`$NC_CONFIG --cflags`
+AC_SUBST(NETCDF_LIBS)
+AC_SUBST(NETCDF_CPPFLAGS)
+
+
+dnl The following will be either "yes" or "no"
+AC_MSG_CHECKING(for netcdf4 support)
+NETCDF_V4=`$NC_CONFIG --has-nc4`
+if test x$NETCDF_V4 == xyes; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(netcdf4 support missing. Did you disable netcdf4 features?)
+fi
+
+dnl **********************************************************
+# Checks for octave depreciated symbols
+# Simple symbol alternatives of different Octave versions.
+save_altsyms_CXX="$CXX"
+save_altsyms_CXXFLAGS="$CXXFLAGS"
+save_altsyms_LDFLAGS="$LDFLAGS"
+save_altsyms_LIBS="$LIBS"
+OCTINCLUDEDIR=${OCTINCLUDEDIR:-`$MKOCTFILE -p INCFLAGS`}
+OCTLIBDIR=${OCTLIBDIR:-`$MKOCTFILE -p OCTLIBDIR`}
+CXX=`${MKOCTFILE} -p CXX`
+CXXFLAGS="$OCTINCLUDEDIR $CXXFLAGS"
+LDFLAGS="-L$OCTLIBDIR $LDFLAGS"
+LIBS="-loctinterp $LIBS"
+
+OF_OCTAVE_LIST_ALT_SYMS([
+
+[dnl
+ [is_empty],
+ [isempty],
+ [[octave_value ().isempty ();]],
+ [OV_ISEMPTY],
+ [],
+ []
+]
+
+],[oct-alt-includes.h])
+
+CXX=$save_altsyms_CXX
+CXXFLAGS=$save_altsyms_CXXFLAGS
+LDFLAGS=$save_altsyms_LDFLAGS
+LIBS=$save_altsyms_LIBS
+
+dnl **********************************************************
+
+
+AC_OUTPUT(Makefile)
+
+AC_MSG_RESULT([
+octave-forge is configured with
+ octave: $OCTAVE
+ mkoctfile: $MKOCTFILE
+ nc-config: $NC_CONFIG
+ netCDF compiler flags: $NETCDF_CPPFLAGS
+ netCDF libraries: $NETCDF_LIBS
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/configure.base new/netcdf-1.0.12/src/configure.base
--- old/netcdf/src/configure.base 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/configure.base 1970-01-01 01:00:00.000000000
+0100
@@ -1,370 +0,0 @@
-dnl The configure script is generated by autogen.sh from configure.base
-dnl and the various configure.add files in the source tree. Edit
-dnl configure.base and reprocess rather than modifying ./configure.
-
-dnl autoconf 2.13 certainly doesn't work! What is the minimum requirement?
-AC_PREREQ(2.2)
-
-AC_INIT(configure.base)
-
-PACKAGE=octave-forge
-MAJOR_VERSION=0
-MINOR_VERSION=1
-PATCH_LEVEL=0
-
-dnl Kill caching --- this ought to be the default
-define([AC_CACHE_LOAD], )dnl
-define([AC_CACHE_SAVE], )dnl
-
-dnl uncomment to put support files in another directory
-dnl AC_CONFIG_AUX_DIR(admin)
-
-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-
-dnl need to find admin files, so keep track of the top dir.
-TOPDIR=`pwd`
-AC_SUBST(TOPDIR)
-
-dnl if mkoctfile doesn't work, then we need the following:
-dnl AC_PROG_CXX
-dnl AC_PROG_F77
-
-dnl Need C compiler regardless so define it in a way that
-dnl makes autoconf happy and we can override whatever we
-dnl need with mkoctfile -p.
-dnl XXX FIXME XXX should use mkoctfile to get CC and CFLAGS
-AC_PROG_CC
-
-dnl XXX FIXME XXX need tests for -p -c -s in mkoctfile.
-
-dnl *******************************************************************
-dnl Sort out mkoctfile version number and install paths
-
-dnl XXX FIXME XXX latest octave has octave-config so we don't
-dnl need to discover things here. Doesn't have --exe-site-dir
-dnl but defines --oct-site-dir and --m-site-dir
-
-dnl Check for mkoctfile
-AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
-test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
-
-AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
-test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path])
-
-AC_SUBST(ver)
-AC_SUBST(subver)
-AC_SUBST(mpath)
-AC_SUBST(opath)
-AC_SUBST(xpath)
-AC_SUBST(altpath)
-AC_SUBST(altmpath)
-AC_SUBST(altopath)
-
-AC_ARG_WITH(path,
- [ --with-path install path prefix],
- [ path=$withval ])
-AC_ARG_WITH(mpath,
- [ --with-mpath override path for m-files],
- [mpath=$withval])
-AC_ARG_WITH(opath,
- [ --with-opath override path for oct-files],
- [opath=$withval])
-AC_ARG_WITH(xpath,
- [ --with-xpath override path for executables],
- [xpath=$withval])
-AC_ARG_WITH(altpath,
- [ --with-altpath alternative functions install path prefix],
- [ altpath=$withval ])
-AC_ARG_WITH(altmpath,
- [ --with-altmpath override path for alternative m-files],
- [altmpath=$withval])
-AC_ARG_WITH(altopath,
- [ --with-altopath override path for alternative oct-files],
- [altopath=$withval])
-
-if test -n "$path" ; then
- test -z "$mpath" && mpath=$path
- test -z "$opath" && opath=$path/oct
- test -z "$xpath" && xpath=$path/bin
- test -z "$altpath" && altpath=$path-alternatives
-fi
-
-if test -n "$altpath" ; then
- test -z "$altmpath" && altmpath=$altpath
- test -z "$altopath" && altopath=$altpath/oct
-fi
-
-dnl Don't query if path/ver are given in the configure environment
-#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z
"$altmpath" || test -z "$altopath" || test -z "$ver" ; then
-if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver"
; then
- dnl Construct program to get mkoctfile version and local install paths
- cat > conftest.cc <<EOF
-#include <octave/config.h>
-#include <octave/version.h>
-#include <octave/defaults.h>
-
-#define INFOV "\nINFOV=" OCTAVE_VERSION "\n"
-
-#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n"
-
-#ifdef OCTAVE_LOCALVERFCNFILEDIR
-# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n"
-#else
-# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n"
-#endif
-
-#ifdef OCTAVE_LOCALVEROCTFILEDIR
-# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n"
-#else
-# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n"
-#endif
-
-#ifdef OCTAVE_LOCALVERARCHLIBDIR
-# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n"
-#else
-# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n"
-#endif
-
-const char *infom = INFOM;
-const char *infoo = INFOO;
-const char *infox = INFOX;
-const char *infoh = INFOH;
-const char *infov = INFOV;
-EOF
-
- dnl Compile program perhaps with a special version of mkoctfile
- $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE)
-
- dnl Strip the config info from the compiled file
- eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"`
- rm -rf conftest*
-
- dnl set the appropriate variables if they are not already set
- ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"`
- subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"`
- alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"`
- alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"`
- test -z "$mpath" && mpath=$INFOM/octave-forge
- test -z "$opath" && opath=$INFOO/octave-forge
- test -z "$xpath" && xpath=$INFOX
- test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m
- test -z "$altopath" &&
altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH
-fi
-
-dnl *******************************************************************
-
-dnl Get LDFLAGS and CPPFLAGS set by user
-dnl These flags will be added to the mkoctfile command line
-NETCDF_LIBS="$LDFLAGS"
-NETCDF_CFLAGS="$CPPFLAGS"
-
-
-dnl XXX FIXME XXX Should we allow the user to override these?
-dnl Do we even need them? The individual makefiles can call mkoctfile -p
-dnl themselves, so the only reason to keep them is for configure, and
-dnl for those things which are not built using mkoctfile (e.g., aurecord)
-dnl but it is not clear we should be using octave compile flags for those.
-
-dnl netcdf does not need CFLAGS, CPPFLAGS,... from mkoctfile
-dnl -> comment corresponding lines
-
-# dnl C compiler and flags
-# AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE])
-# CC=`$MKOCTFILE -p CC`
-# CFLAGS=`$MKOCTFILE -p CFLAGS`
-# CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
-# CPPFLAGS="not used"
-# CPICFLAG=`$MKOCTFILE -p CPICFLAG`
-# LDFLAGS=`$MKOCTFILE -p LDFLAGS`
-# LIBS=`$MKOCTFILE -p LIBS`
-# AC_SUBST(CC)
-# AC_SUBST(CFLAGS)
-# AC_SUBST(CPPFLAGS)
-# AC_SUBST(CPICFLAG)
-
-# dnl Fortran compiler and flags
-# F77=`$MKOCTFILE -p F77`
-# FFLAGS=`$MKOCTFILE -p FFLAGS`
-# FPICFLAG=`$MKOCTFILE -p FPICFLAG`
-# AC_SUBST(F77)
-# AC_SUBST(FFLAGS)
-# AC_SUBST(FPICFLAG)
-
-# dnl C++ compiler and flags
-# CXX=`$MKOCTFILE -p CXX`
-# CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
-# CXXPICFLAG=`$MKOCTFILE -p CXXPICFLAG`
-# AC_SUBST(CXX)
-# AC_SUBST(CXXFLAGS)
-# AC_SUBST(CXXPICFLAG)
-
-dnl *******************************************************************
-
-dnl Check for features of your version of mkoctfile.
-dnl All checks should be designed so that the default
-dnl action if the tests are not performed is to do whatever
-dnl is appropriate for the most recent version of Octave.
-
-dnl Define the following macro:
-dnl OF_CHECK_LIB(lib,fn,true,false,helpers)
-dnl This is just like AC_CHECK_LIB, but it doesn't update LIBS
-AC_DEFUN(OF_CHECK_LIB,
-[save_LIBS="$LIBS"
-AC_CHECK_LIB($1,$2,$3,$4,$5)
-LIBS="$save_LIBS"
-])
-
-dnl Define the following macro:
-dnl TRY_MKOCTFILE(msg,program,action_if_true,action_if_false)
-dnl
-AC_DEFUN(TRY_MKOCTFILE,
-[AC_MSG_CHECKING($1)
-cat > conftest.cc << EOF
-#include <octave/config.h>
-$2
-EOF
-ac_try="$MKOCTFILE -c conftest.cc"
-if AC_TRY_EVAL(ac_try) ; then
- AC_MSG_RESULT(yes)
- $3
-else
- AC_MSG_RESULT(no)
- $4
-fi
-])
-
-dnl
-dnl Check if F77_FUNC works with MKOCTFILE
-dnl
-TRY_MKOCTFILE([for F77_FUNC],
-[int F77_FUNC (hello, HELLO) (const int &n);],,
-[MKOCTFILE="$MKOCTFILE -DF77_FUNC=F77_FCN"])
-
-dnl **********************************************************
-
-dnl Evaluate an expression in octave
-dnl
-dnl OCTAVE_EVAL(expr,var) -> var=expr
-dnl
-AC_DEFUN(OCTAVE_EVAL,
-[AC_MSG_CHECKING([for $1 in Octave])
-$2=`echo "disp($1)" | $OCTAVE -qf`
-AC_MSG_RESULT($$2)
-AC_SUBST($2)
-])
-
-AC_DEFUN(OCTAVE_CONFIG_EVAL,
-[AC_MSG_CHECKING([for $1 in octave-config])
-$2=`$OCTAVE_CONFIG -p $1`
-AC_MSG_RESULT($$2)
-AC_SUBST($2)
-])
-
-dnl Check status of an octave variable
-dnl
-dnl OCTAVE_CHECK_EXIST(variable,action_if_true,action_if_false)
-dnl
-AC_DEFUN(OCTAVE_CHECK_EXIST,
-[AC_MSG_CHECKING([for $1 in Octave])
-if test `echo 'disp(exist("$1"))' | $OCTAVE -qf`X != 0X ; then
- AC_MSG_RESULT(yes)
- $2
-else
- AC_MSG_RESULT(no)
- $3
-fi
-])
-
-dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
-AC_CHECK_PROG(OCTAVE,octave,octave)
-OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
-
-dnl grab canonical host type so we can write system specific install stuff
-OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
-
-dnl grab SHLEXT from octave config
-OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
-
-AC_PROG_LN_S
-
-AC_PROG_RANLIB
-
-dnl Use $(COPY_FLAGS) to set options for cp when installing .oct files.
-COPY_FLAGS="-Rfp"
-case "$canonical_host_type" in
- *-*-linux*)
- COPY_FLAGS="-fdp"
- ;;
-esac
-AC_SUBST(COPY_FLAGS)
-
-dnl Use $(STRIP) in the makefile to strip executables. If not found,
-dnl STRIP expands to ':', which in the makefile does nothing.
-dnl Don't need this for .oct files since mkoctfile handles them directly
-STRIP=${STRIP-strip}
-AC_CHECK_PROG(STRIP,$STRIP,$STRIP,:)
-
-dnl Strip on windows, don't strip on Mac OS/X or IRIX
-dnl For the rest, you can force strip using MKOCTFILE="mkoctfile -s"
-dnl or avoid strip using STRIP=: before ./configure
-case "$canonical_host_type" in
- powerpc-apple-darwin*|*-sgi-*)
- STRIP=:
- ;;
- *-cygwin-*|*-mingw-*)
- MKOCTFILE="$MKOCTFILE -s"
- ;;
-esac
-
-dnl checking for nc-config
-
-dnl AC_CHECK_PROG(NC_CONFIG, nc-config, nc-config)
-AC_CHECK_TOOL(NC_CONFIG, nc-config, nc-config)
-if test -z "$NC_CONFIG"; then
-AC_MSG_ERROR([nc-config not found], 1);
-fi
-
-
-dnl The following will be either "yes" or "no"
-AC_MSG_CHECKING(for netcdf4 support)
-NETCDF_V4=`$NC_CONFIG --has-nc4`
-if test x$NETCDF_V4 != yes; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(netcdf4 support missing. Did you disable netcdf4 features?)
-fi
-
-dnl other way to check this
-dnl NETCDF_LIBS="$NETCDF_LIBS `$NC_CONFIG --libs`"
-dnl NETCDF_CFLAGS="$NETCDF_CFLAGS `$NC_CONFIG --cflags`"
-dnl CFLAGS="$NETCDF_CFLAGS $CFLAGS"
-dnl CXXFLAGS="$NETCDF_CFLAGS $CXXFLAGS"
-dnl LDFLAGS="$NETCDF_LIBS $LDFLAGS"
-dnl AC_CHECK_LIB([netcdf], [nc_set_chunk_cache], ,
[AC_MSG_ERROR(nc_set_chunk_cache was not found in the netCDF library. Did you
disable netcdf4 features?)])
-
-
-CONFIGURE_OUTPUTS="Makeconf"
-STATUS_MSG="
-octave commands will install into the following directories:
- m-files: $mpath
- oct-files: $opath
- binaries: $xpath
-alternatives:
- m-files: $altmpath
- oct-files: $altopath
-
-shell commands will install into the following directories:
- binaries: $bindir
- man pages: $mandir
- libraries: $libdir
- headers: $includedir
-
-octave-forge is configured with
- octave: $OCTAVE (version $OCTAVE_VERSION)
- mkoctfile: $MKOCTFILE for Octave $subver
- octave-config: $OCTAVE_CONFIG for Octave $subver
- netCDF compiler flags: $NETCDF_CFLAGS
- netCDF libraries: $NETCDF_LIBS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/m4/octave-forge.m4 new/netcdf-1.0.12/src/m4/octave-forge.m4
--- old/netcdf/src/m4/octave-forge.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/src/m4/octave-forge.m4 2018-04-12 17:00:38.000000000
+0200
@@ -0,0 +1,93 @@
+# Copyright (C) 2017-2018 Olaf Till <[email protected]>
+# Modifications to print what is searching for by JohnD
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+# arguments of OF_OCTAVE_ALT_SYMS (see also description of
+# OF_OCTAVE_LIST_ALT_SYMS below):
+#
+# $1: symbol version 1
+# $2: symbol version 2
+# $3: test for symbol version 2
+# $4: macro name to access alternative symbols
+# $5: include directives for symbol version 1
+# $6: include directives for symbol version 2
+# (a list of lists of args 1--6 is $1 of OF_OCTAVE_LIST_ALT_SYMS)
+# $7: name of generated include file with alternatives of Octave headers
+# (arg7 is $2 of OF_OCTAVE_LIST_ALT_SYMS)
+AC_DEFUN([OF_OCTAVE_ALT_SYMS], [
+AC_MSG_CHECKING([$1 or $2])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[#include <octave/oct.h>]
+ $6],
+ [$3])],
+ [AC_DEFINE($4,
+ [[$2]],
+ [macro for alternative Octave symbols])
+ AC_MSG_RESULT([$2])
+ echo '$6' >> $7],
+ [AC_DEFINE($4,
+ [[$1]],
+ [macro for alternative Octave symbols])
+ AC_MSG_RESULT([$1])
+ echo '$5' >> $7]
+)
+])
+
+
+# OF_OCTAVE_LIST_ALT_SYMS is called in the following way:
+#
+# OF_OCTAVE_LIST_ALT_SYMS([
+# [dnl
+# [old_octave_symbol],
+# [new_octave_symbol],
+# [[compilation test]
+# [for new_octave_symbol]],
+# [NAME_OF_GENERATED_MACRO____WILL_EXPAND_TO_OLD_OR_NEW_SYMBOL],
+# [[include directives]
+# [except #include <octave/oct.h>]
+# [necessary to compile with old_octave_symbol]],
+# [[include directives]
+# [except #include <octave/oct.h>]
+# [nessary to compile with new_octave_symbol]
+# [and to compile the test]]
+# ],
+#
+# ... further such lists as the above
+#
+# ],
+#
+# [name-of-header-file-for-alternative-octave-iclude-directives.h])
+#
+#
+# This file should be put into src/m4/, and the line
+#
+# AC_CONFIG_MACRO_DIRS([m4])
+#
+# should be put into src/configure.ac. The package should use
+# autoheader to generate config.h.in (src/bootstrap should contain the
+# lines 'aclocal', 'autoconf', and 'autoheader -f'). Package code
+# should include config.h and use the generated macros to access the
+# alternative symbols of Octave. An example of a call to
+# OF_OCTAVE_LIST_ALT_SYMS in src/configure.ac is available together
+# with this file.
+AC_DEFUN([OF_OCTAVE_LIST_ALT_SYMS], [
+
+echo '/* generated by configure */' > $2
+
+m4_foreach([it], [$1], [m4_apply([OF_OCTAVE_ALT_SYMS], [it, $2])])
+
+AH_BOTTOM([#include "$2"])
+
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/netcdf_constants.h new/netcdf-1.0.12/src/netcdf_constants.h
--- old/netcdf/src/netcdf_constants.h 2016-05-19 14:55:59.000000000 +0200
+++ new/netcdf-1.0.12/src/netcdf_constants.h 1970-01-01 01:00:00.000000000
+0100
@@ -1,158 +0,0 @@
-// 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);
- netcdf_constants["NC_SHORT"] = octave_value(NC_SHORT);
- netcdf_constants["NC_INT"] = octave_value(NC_INT);
- netcdf_constants["NC_LONG"] = octave_value(NC_LONG);
- netcdf_constants["NC_FLOAT"] = octave_value(NC_FLOAT);
- netcdf_constants["NC_DOUBLE"] = octave_value(NC_DOUBLE);
- netcdf_constants["NC_UBYTE"] = octave_value(NC_UBYTE);
- netcdf_constants["NC_USHORT"] = octave_value(NC_USHORT);
- netcdf_constants["NC_UINT"] = octave_value(NC_UINT);
- netcdf_constants["NC_INT64"] = octave_value(NC_INT64);
- netcdf_constants["NC_UINT64"] = octave_value(NC_UINT64);
- netcdf_constants["NC_STRING"] = octave_value(NC_STRING);
- netcdf_constants["NC_FILL_BYTE"] = octave_value(octave_int8(NC_FILL_BYTE));
- netcdf_constants["NC_FILL_CHAR"] = octave_value((char)NC_FILL_CHAR);
- netcdf_constants["NC_FILL_SHORT"] =
octave_value(octave_int16(NC_FILL_SHORT));
- netcdf_constants["NC_FILL_INT"] = octave_value(octave_int32(NC_FILL_INT));
- netcdf_constants["NC_FILL_FLOAT"] = octave_value((float)NC_FILL_FLOAT);
- netcdf_constants["NC_FILL_DOUBLE"] = octave_value(NC_FILL_DOUBLE);
- netcdf_constants["NC_FILL_UBYTE"] =
octave_value(octave_uint8(NC_FILL_UBYTE));
- netcdf_constants["NC_FILL_USHORT"] =
octave_value(octave_uint16(NC_FILL_USHORT));
- netcdf_constants["NC_FILL_UINT"] = octave_value(octave_uint32(NC_FILL_UINT));
- netcdf_constants["NC_FILL_INT64"] =
octave_value(octave_int32(NC_FILL_INT64));
- netcdf_constants["NC_FILL_UINT64"] =
octave_value(octave_uint32(NC_FILL_UINT64));
- netcdf_constants["NC_FILL_STRING"] =
octave_value(std::string(NC_FILL_STRING));
- netcdf_constants["NC_MAX_BYTE"] = octave_value(octave_int8(NC_MAX_BYTE));
- netcdf_constants["NC_MIN_BYTE"] = octave_value(octave_int8(NC_MIN_BYTE));
- netcdf_constants["NC_MAX_CHAR"] = octave_value((char)NC_MAX_CHAR);
- netcdf_constants["NC_MAX_SHORT"] = octave_value(octave_int16(NC_MAX_SHORT));
- netcdf_constants["NC_MIN_SHORT"] = octave_value(octave_int16(NC_MIN_SHORT));
- netcdf_constants["NC_MAX_INT"] = octave_value(octave_int32(NC_MAX_INT));
- netcdf_constants["NC_MIN_INT"] = octave_value(octave_int32(NC_MIN_INT));
- netcdf_constants["NC_MAX_FLOAT"] = octave_value((float)NC_MAX_FLOAT);
- netcdf_constants["NC_MIN_FLOAT"] = octave_value((float)NC_MIN_FLOAT);
- netcdf_constants["NC_MAX_DOUBLE"] = octave_value(NC_MAX_DOUBLE);
- netcdf_constants["NC_MIN_DOUBLE"] = octave_value(NC_MIN_DOUBLE);
- netcdf_constants["NC_MAX_UBYTE"] = octave_value(octave_uint8(NC_MAX_UBYTE));
- netcdf_constants["NC_MAX_USHORT"] =
octave_value(octave_uint16(NC_MAX_USHORT));
- netcdf_constants["NC_MAX_UINT"] = octave_value(octave_uint32(NC_MAX_UINT));
- netcdf_constants["NC_MAX_INT64"] = octave_value(octave_int32(NC_MAX_INT64));
- netcdf_constants["NC_MIN_INT64"] = octave_value(octave_int32(NC_MIN_INT64));
- netcdf_constants["NC_MAX_UINT64"] =
octave_value(octave_uint32(NC_MAX_UINT64));
- netcdf_constants["NC_FILL"] = octave_value(NC_FILL);
- netcdf_constants["NC_NOFILL"] = octave_value(NC_NOFILL);
- netcdf_constants["NC_NOWRITE"] = octave_value(NC_NOWRITE);
- netcdf_constants["NC_WRITE"] = octave_value(NC_WRITE);
- netcdf_constants["NC_CLOBBER"] = octave_value(NC_CLOBBER);
- netcdf_constants["NC_NOCLOBBER"] = octave_value(NC_NOCLOBBER);
- netcdf_constants["NC_64BIT_OFFSET"] = octave_value(NC_64BIT_OFFSET);
- netcdf_constants["NC_NETCDF4"] = octave_value(NC_NETCDF4);
- netcdf_constants["NC_CLASSIC_MODEL"] = octave_value(NC_CLASSIC_MODEL);
- netcdf_constants["NC_SHARE"] = octave_value(NC_SHARE);
- netcdf_constants["NC_MPIIO"] = octave_value(NC_MPIIO);
- netcdf_constants["NC_MPIPOSIX"] = octave_value(NC_MPIPOSIX);
- netcdf_constants["NC_PNETCDF"] = octave_value(NC_PNETCDF);
- netcdf_constants["NC_LOCK"] = octave_value(NC_LOCK);
- netcdf_constants["NC_FORMAT_CLASSIC"] = octave_value(NC_FORMAT_CLASSIC);
- netcdf_constants["NC_FORMAT_64BIT"] = octave_value(NC_FORMAT_64BIT);
- netcdf_constants["NC_FORMAT_NETCDF4"] = octave_value(NC_FORMAT_NETCDF4);
- netcdf_constants["NC_FORMAT_NETCDF4_CLASSIC"] =
octave_value(NC_FORMAT_NETCDF4_CLASSIC);
- netcdf_constants["NC_SIZEHINT_DEFAULT"] = octave_value(NC_SIZEHINT_DEFAULT);
- netcdf_constants["NC_ALIGN_CHUNK"] = octave_value(NC_ALIGN_CHUNK);
- netcdf_constants["NC_UNLIMITED"] = octave_value(NC_UNLIMITED);
- netcdf_constants["NC_GLOBAL"] = octave_value(NC_GLOBAL);
- netcdf_constants["NC_MAX_DIMS"] = octave_value(NC_MAX_DIMS);
- netcdf_constants["NC_MAX_ATTRS"] = octave_value(NC_MAX_ATTRS);
- netcdf_constants["NC_MAX_VARS"] = octave_value(NC_MAX_VARS);
- netcdf_constants["NC_MAX_NAME"] = octave_value(NC_MAX_NAME);
- netcdf_constants["NC_MAX_VAR_DIMS"] = octave_value(NC_MAX_VAR_DIMS);
- netcdf_constants["NC_ENDIAN_NATIVE"] = octave_value(NC_ENDIAN_NATIVE);
- netcdf_constants["NC_ENDIAN_LITTLE"] = octave_value(NC_ENDIAN_LITTLE);
- netcdf_constants["NC_ENDIAN_BIG"] = octave_value(NC_ENDIAN_BIG);
- netcdf_constants["NC_CHUNKED"] = octave_value(NC_CHUNKED);
- netcdf_constants["NC_CONTIGUOUS"] = octave_value(NC_CONTIGUOUS);
- netcdf_constants["NC_NOCHECKSUM"] = octave_value(NC_NOCHECKSUM);
- netcdf_constants["NC_FLETCHER32"] = octave_value(NC_FLETCHER32);
- netcdf_constants["NC_NOSHUFFLE"] = octave_value(NC_NOSHUFFLE);
- netcdf_constants["NC_SHUFFLE"] = octave_value(NC_SHUFFLE);
- netcdf_constants["NC_NOERR"] = octave_value(NC_NOERR);
- netcdf_constants["NC_EBADID"] = octave_value(NC_EBADID);
- netcdf_constants["NC_ENFILE"] = octave_value(NC_ENFILE);
- netcdf_constants["NC_EEXIST"] = octave_value(NC_EEXIST);
- netcdf_constants["NC_EINVAL"] = octave_value(NC_EINVAL);
- netcdf_constants["NC_EPERM"] = octave_value(NC_EPERM);
- netcdf_constants["NC_ENOTINDEFINE"] = octave_value(NC_ENOTINDEFINE);
- netcdf_constants["NC_EINDEFINE"] = octave_value(NC_EINDEFINE);
- netcdf_constants["NC_EINVALCOORDS"] = octave_value(NC_EINVALCOORDS);
- netcdf_constants["NC_EMAXDIMS"] = octave_value(NC_EMAXDIMS);
- netcdf_constants["NC_ENAMEINUSE"] = octave_value(NC_ENAMEINUSE);
- netcdf_constants["NC_ENOTATT"] = octave_value(NC_ENOTATT);
- netcdf_constants["NC_EMAXATTS"] = octave_value(NC_EMAXATTS);
- netcdf_constants["NC_EBADTYPE"] = octave_value(NC_EBADTYPE);
- netcdf_constants["NC_EBADDIM"] = octave_value(NC_EBADDIM);
- netcdf_constants["NC_EUNLIMPOS"] = octave_value(NC_EUNLIMPOS);
- netcdf_constants["NC_EMAXVARS"] = octave_value(NC_EMAXVARS);
- netcdf_constants["NC_ENOTVAR"] = octave_value(NC_ENOTVAR);
- netcdf_constants["NC_EGLOBAL"] = octave_value(NC_EGLOBAL);
- netcdf_constants["NC_ENOTNC"] = octave_value(NC_ENOTNC);
- netcdf_constants["NC_ESTS"] = octave_value(NC_ESTS);
- netcdf_constants["NC_EMAXNAME"] = octave_value(NC_EMAXNAME);
- netcdf_constants["NC_EUNLIMIT"] = octave_value(NC_EUNLIMIT);
- netcdf_constants["NC_ENORECVARS"] = octave_value(NC_ENORECVARS);
- netcdf_constants["NC_ECHAR"] = octave_value(NC_ECHAR);
- netcdf_constants["NC_EEDGE"] = octave_value(NC_EEDGE);
- netcdf_constants["NC_ESTRIDE"] = octave_value(NC_ESTRIDE);
- netcdf_constants["NC_EBADNAME"] = octave_value(NC_EBADNAME);
- netcdf_constants["NC_ERANGE"] = octave_value(NC_ERANGE);
- netcdf_constants["NC_ENOMEM"] = octave_value(NC_ENOMEM);
- netcdf_constants["NC_EVARSIZE"] = octave_value(NC_EVARSIZE);
- netcdf_constants["NC_EDIMSIZE"] = octave_value(NC_EDIMSIZE);
- netcdf_constants["NC_ETRUNC"] = octave_value(NC_ETRUNC);
- netcdf_constants["NC_EAXISTYPE"] = octave_value(NC_EAXISTYPE);
- netcdf_constants["NC_EDAP"] = octave_value(NC_EDAP);
- netcdf_constants["NC_ECURL"] = octave_value(NC_ECURL);
- netcdf_constants["NC_EIO"] = octave_value(NC_EIO);
- netcdf_constants["NC_ENODATA"] = octave_value(NC_ENODATA);
- netcdf_constants["NC_EDAPSVC"] = octave_value(NC_EDAPSVC);
- netcdf_constants["NC_EDAS"] = octave_value(NC_EDAS);
- netcdf_constants["NC_EDDS"] = octave_value(NC_EDDS);
- netcdf_constants["NC_EDATADDS"] = octave_value(NC_EDATADDS);
- netcdf_constants["NC_EDAPURL"] = octave_value(NC_EDAPURL);
- netcdf_constants["NC_EDAPCONSTRAINT"] = octave_value(NC_EDAPCONSTRAINT);
- netcdf_constants["NC_EHDFERR"] = octave_value(NC_EHDFERR);
- netcdf_constants["NC_ECANTREAD"] = octave_value(NC_ECANTREAD);
- netcdf_constants["NC_ECANTWRITE"] = octave_value(NC_ECANTWRITE);
- netcdf_constants["NC_ECANTCREATE"] = octave_value(NC_ECANTCREATE);
- netcdf_constants["NC_EFILEMETA"] = octave_value(NC_EFILEMETA);
- netcdf_constants["NC_EDIMMETA"] = octave_value(NC_EDIMMETA);
- netcdf_constants["NC_EATTMETA"] = octave_value(NC_EATTMETA);
- netcdf_constants["NC_EVARMETA"] = octave_value(NC_EVARMETA);
- netcdf_constants["NC_ENOCOMPOUND"] = octave_value(NC_ENOCOMPOUND);
- netcdf_constants["NC_EATTEXISTS"] = octave_value(NC_EATTEXISTS);
- netcdf_constants["NC_ENOTNC4"] = octave_value(NC_ENOTNC4);
- netcdf_constants["NC_ESTRICTNC3"] = octave_value(NC_ESTRICTNC3);
- netcdf_constants["NC_ENOTNC3"] = octave_value(NC_ENOTNC3);
- netcdf_constants["NC_ENOPAR"] = octave_value(NC_ENOPAR);
- netcdf_constants["NC_EPARINIT"] = octave_value(NC_EPARINIT);
- netcdf_constants["NC_EBADGRPID"] = octave_value(NC_EBADGRPID);
- netcdf_constants["NC_EBADTYPID"] = octave_value(NC_EBADTYPID);
- netcdf_constants["NC_ETYPDEFINED"] = octave_value(NC_ETYPDEFINED);
- netcdf_constants["NC_EBADFIELD"] = octave_value(NC_EBADFIELD);
- netcdf_constants["NC_EBADCLASS"] = octave_value(NC_EBADCLASS);
- netcdf_constants["NC_EMAPTYPE"] = octave_value(NC_EMAPTYPE);
- netcdf_constants["NC_ELATEFILL"] = octave_value(NC_ELATEFILL);
- netcdf_constants["NC_ELATEDEF"] = octave_value(NC_ELATEDEF);
- netcdf_constants["NC_EDIMSCALE"] = octave_value(NC_EDIMSCALE);
- netcdf_constants["NC_ENOGRP"] = octave_value(NC_ENOGRP);
- netcdf_constants["NC_ESTORAGE"] = octave_value(NC_ESTORAGE);
- 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_ENTOOL"] = octave_value(NC_ENTOOL);
- netcdf_constants["NC_EXDR"] = octave_value(NC_EXDR);
- netcdf_constants["NC_SYSERR"] = octave_value(NC_SYSERR);
- netcdf_constants["NC_FATAL"] = octave_value(NC_FATAL);
- netcdf_constants["NC_VERBOSE"] = octave_value(NC_VERBOSE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/netcdf/src/undef-ah-octave.h new/netcdf-1.0.12/src/undef-ah-octave.h
--- old/netcdf/src/undef-ah-octave.h 1970-01-01 01:00:00.000000000 +0100
+++ new/netcdf-1.0.12/src/undef-ah-octave.h 2018-04-12 17:00:38.000000000
+0200
@@ -0,0 +1,27 @@
+/* To be included at the top of config.h (by autoheader). Avoid
+ warnings for redefining AH-generated preprocessor symbols of
+ Octave. */
+
+#ifdef PACKAGE_BUGREPORT
+#undef PACKAGE_BUGREPORT
+#endif
+
+#ifdef PACKAGE_NAME
+#undef PACKAGE_NAME
+#endif
+
+#ifdef PACKAGE_STRING
+#undef PACKAGE_STRING
+#endif
+
+#ifdef PACKAGE_TARNAME
+#undef PACKAGE_TARNAME
+#endif
+
+#ifdef PACKAGE_URL
+#undef PACKAGE_URL
+#endif
+
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif
