Mercurial > octave
changeset 25219:e98c6d393abb
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Apr 2018 15:23:44 -0400 |
| parents | 325145377713 (current diff) 164399071f4d (diff) |
| children | 22ece7843499 |
| files | configure.ac libinterp/corefcn/error.cc |
| diffstat | 10 files changed, 59 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Apr 11 10:38:08 2018 -0400 +++ b/Makefile.am Wed Apr 11 15:23:44 2018 -0400 @@ -244,6 +244,13 @@ if AMCOND_ENABLE_HG_ID hg-id-dist-hook: + @test x"$(DIST_IGNORE_HG_STATE)" != x \ + || echo $(HG_ID_VAR) | $(GREP) '^[0-9a-f]\{12\}$$' >/dev/null 2>&1 \ + || { echo ; \ + echo "Packaging distribution requires a clean hg working tree with no uncommitted changes." ; \ + echo "Please commit or revert your changes first, or pass DIST_IGNORE_HG_STATE=1." ; \ + echo "Cannot package distribution!" ; \ + echo ; exit 1; } else hg-id-dist-hook: @echo "WARNING: Octave was configured with --disable-hg-id" 1>&2
--- a/README Wed Apr 11 10:38:08 2018 -0400 +++ b/README Wed Apr 11 15:23:44 2018 -0400 @@ -43,12 +43,12 @@ Installation ------------ -Octave requires approximately 1.4 GB of disk storage to unpack and -compile from source (significantly less, 400 MB, if you don't compile -with debugging symbols). Once installed, Octave requires -approximately 350 MB of disk space (again, considerably less, 70 MB, -if you don't build shared libraries or the binaries and libraries do -not include debugging symbols). +Octave requires approximately 475 MB of disk storage to unpack and +compile from source (significantly more, 3.8 GB, if you compile with +debugging symbols). Once installed, Octave requires approximately +75 MB of disk space (again, considerably more, 415 MB, if you don't +build shared libraries or the binaries and libraries include +debugging symbols). To compile Octave, you will need a recent version of:
--- a/configure.ac Wed Apr 11 10:38:08 2018 -0400 +++ b/configure.ac Wed Apr 11 15:23:44 2018 -0400 @@ -2308,6 +2308,8 @@ ;; esac done + FLTK_CPPFLAGS=`echo "$FLTK_CPPFLAGS" | $SED -e 's/^ \+//'` + ## Split -L and -l options into FLTK_LDFLAGS and FLTK_LIBS fltk_ldflags=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` for fltk_option in $fltk_ldflags; do @@ -2320,6 +2322,8 @@ ;; esac done + FLTK_LIBS=`echo "$FLTK_LIBS" | $SED -e 's/^ \+//'` + FLTK_LDFLAGS=`echo "$FLTK_LDFLAGS" | $SED -e 's/^ \+//'` case $host_os in mingw*)
--- a/doc/interpreter/octave.texi Wed Apr 11 10:38:08 2018 -0400 +++ b/doc/interpreter/octave.texi Wed Apr 11 15:23:44 2018 -0400 @@ -92,8 +92,13 @@ @titlepage @title GNU Octave @subtitle A high-level interactive language for numerical computations +@c FIXME: Would like to use @value{EDITION} but this variable is the +@c same as VERSION and contains MAJOR.MINOR.PATCH. The variable +@c is automatically generated by Automake in version-octave.texi. +@c Need to use sed to strip off MINOR.PATCH numbers and place +@c the results in a new file, and then @include that new file. @subtitle Edition 4 for Octave version @value{VERSION} -@subtitle March 2018 +@subtitle @value{UPDATED-MONTH} @sp 2 @multitable @columnfractions 0.4 0.025 0.65 @item
--- a/libinterp/corefcn/error.cc Wed Apr 11 10:38:08 2018 -0400 +++ b/libinterp/corefcn/error.cc Wed Apr 11 15:23:44 2018 -0400 @@ -1420,21 +1420,20 @@ @deftypefnx {} {} warning ("error", @var{id}) @deftypefnx {} {} warning ("query", @var{id}) @deftypefnx {} {} warning (@var{state}, @var{id}, "local") -@deftypefnx {} {} warning (@var{stin}) -@deftypefnx {} {@var{stout} =} warning (@dots{}) -@deftypefnx {} {@var{mode_st} =} warning (@var{state}, @var{mode}) +@deftypefnx {} {} warning (@var{warning_struct}) +@deftypefnx {} {@var{warning_struct} =} warning (@dots{}) +@deftypefnx {} {@var{mode_struct} =} warning (@var{state}, @var{mode}) @deftypefnx {} {} warning (@var{mode_st}) -Display a warning message or control the behavior of Octave's warning -system. +Display a warning message or control the behavior of Octave's warning system. -The first call form uses a template @var{template} and optional -additional arguments to display a message on the @code{stderr} stream. -The message is formatted using the same rules as the @code{printf} family -of functions (@pxref{Formatted Output}) and prefixed by the character -string @samp{warning: }. You should use this function when you want to -notify the user of an unusual condition, but only when it makes sense for -your program to go on. For example: +The first call form uses a template @var{template} and optional additional +arguments to display a message on the @code{stderr} stream. The message is +formatted using the same rules as the @code{printf} family of functions +(@pxref{Formatted Output}) and prefixed by the character string +@w{@samp{warning: }}. You should use this function when you want to notify the +user of an unusual condition, but only when it makes sense for your program to +go on. For example: @example @group @@ -1460,9 +1459,9 @@ @qcode{"off"}, @qcode{"error"}, or @qcode{"query"}) followed by an optional warning identifier @var{id} or @qcode{"all"} (default). -The optional output argument @var{stout} is a structure or structure array -with fields @qcode{"state"} and @qcode{"identifier"}. The @var{state} argument -may have the following values: +The optional output argument @var{warning_struct} is a structure or structure +array with fields @qcode{"state"} and @qcode{"identifier"}. The @var{state} +argument may have the following values: @table @asis @item @qcode{"on"}|@qcode{"off"}: @@ -1477,10 +1476,10 @@ Return the current state of warnings identified by @var{id}. @end table -A structure or structure array @var{stin}, with fields @qcode{"state"} and -@qcode{"identifier"}, may be passed to achieve equivalent results. The -following example shows how to temporarily disable a warning and then restore -its original state: +A structure or structure array @var{warning_struct}, with fields +@qcode{"state"} and @qcode{"identifier"}, may be given as an input to achieve +equivalent results. The following example shows how to temporarily disable a +warning and then restore its original state: @example @group @@ -1519,12 +1518,12 @@ In this case the @var{state} argument may only be @qcode{"on"} or @qcode{"off"}. -Implementation Note: For compatibility with @sc{matlab}, escape -sequences in @var{template} (e.g., @qcode{"@xbackslashchar{}n"} => -newline) are processed regardless of whether @var{template} has been defined -with single quotes, as long as there are two or more input arguments. To -disable escape sequence expansion use a second backslash before the sequence -(e.g., @qcode{"@xbackslashchar{}@xbackslashchar{}n"}) or use the +Implementation Note: For compatibility with @sc{matlab}, escape sequences in +@var{template} (e.g., @qcode{"@xbackslashchar{}n"} => newline) are processed +regardless of whether @var{template} has been defined with single quotes, as +long as there are two or more input arguments. To disable escape sequence +expansion use a second backslash before the sequence (e.g., +@qcode{"@xbackslashchar{}@xbackslashchar{}n"}) or use the @code{regexptranslate} function. @seealso{warning_ids, lastwarn, error} @end deftypefn */)
--- a/scripts/specfun/gammainc.m Wed Apr 11 10:38:08 2018 -0400 +++ b/scripts/specfun/gammainc.m Wed Apr 11 15:23:44 2018 -0400 @@ -519,8 +519,7 @@ %! y_exp = 9.995001666250085e-04; %! assert (gammainc (1/1000, 1), y_exp, -eps); -## FIXME: should this be tagged with a bug report number? -%!xtest +%!xtest <53612> %! assert (gammainc (-20, 1.1, "upper"), ... %! 6.50986687074979e8 + 2.11518396291149e8*i, -1e-13);
--- a/scripts/testfun/test.m Wed Apr 11 10:38:08 2018 -0400 +++ b/scripts/testfun/test.m Wed Apr 11 15:23:44 2018 -0400 @@ -1010,7 +1010,7 @@ ## Test 'xtest' keyword %!xtest %! assert (1, 1); # Test passes -%!xtest +%!xtest <53613> %! assert (0, 1); # Test fails ## Test comment block. It can contain anything.
--- a/test/classdef/classdef.tst Wed Apr 11 10:38:08 2018 -0400 +++ b/test/classdef/classdef.tst Wed Apr 11 15:23:44 2018 -0400 @@ -48,7 +48,7 @@ %!assert (p.principle, 50e3) %!assert (p.amount, amt, eps ()) %!assert (amount (p), amt, eps ()) -%!xtest +%!xtest <53614> %! assert (properties (p), {'rate'; 'term'; 'principle'}); %!test <42510> %! assert (methods (p), {'amount'; 'foo_value_class'});
--- a/test/jit.tst Wed Apr 11 10:38:08 2018 -0400 +++ b/test/jit.tst Wed Apr 11 15:23:44 2018 -0400 @@ -540,9 +540,11 @@ %! assert (b, 1); %! assert (jit_failcnt, 0); -%!xtest +%!xtest <53615> %! ## FIXME: No support for functions with complex input prototypes -%! ## testif HAVE_LLVM +%! if (! __have_feature__ ("ENABLE_JIT")) +%! return; +%! endif %! jit_failcnt (0); %! a = [1+1i 1+2i]; %! b = 0; @@ -571,9 +573,11 @@ %!shared id %! id = @(x) x; -%!xtest +%!xtest <53615> %! ## FIXME: No support for functions with complex input prototypes -%! ## testif HAVE_LLVM +%! if (! __have_feature__ ("ENABLE_JIT")) +%! return; +%! endif %! jit_failcnt (0); %! assert (id (1), 1); %! assert (id (1+1i), 1+1i);
--- a/test/mk-sparse-tst.sh Wed Apr 11 10:38:08 2018 -0400 +++ b/test/mk-sparse-tst.sh Wed Apr 11 15:23:44 2018 -0400 @@ -332,7 +332,7 @@ %!assert (as+bs, sparse (af+bf)) %!assert (as-bs, sparse (af-bf)) %!assert (as.*bs, sparse (af.*bf)) -%!xtest assert (as./bs, sparse (af./bf), 100*eps) +%!assert (as./bs, sparse (af./bf), 100*eps) %!test %! sv = as.^bs; %! fv = af.^bf;