Mercurial > hg > octave-lyh
changeset 12729:d6bd2f2c35cc
periodic merge of stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 09 Jun 2011 13:53:34 -0400 |
| parents | ff4773f01b6a (current diff) a17269b1148f (diff) |
| children | f87ec8eb0ab0 |
| files | NEWS OLD-ChangeLogs/ChangeLog OLD-ChangeLogs/scripts-ChangeLog OLD-ChangeLogs/src-ChangeLog scripts/deprecated/module.mk src/DLD-FUNCTIONS/chol.cc src/Makefile.am src/oct-parse.yy |
| diffstat | 10 files changed, 56 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am +++ b/Makefile.am @@ -50,8 +50,10 @@ PROJECTS \ README \ README.Cygwin \ + README.gnuplot \ README.Linux \ README.MacOS \ + README.MinGW \ README.Windows \ README.kpathsea \ autogen.sh \ @@ -114,7 +116,7 @@ CLEANFILES = $(bin_PROGRAMS) $(bin_SCRIPTS) $(BUILT_SOURCES) -DISTCLEANFILES = $(INFO_FILES) .gdbinit +DISTCLEANFILES = $(INFO_FILES) ChangeLog .gdbinit CONFIG_FILES = @ac_config_headers@ @ac_config_files@ @@ -164,7 +166,7 @@ .PHONY: AUTHORS BUGS INSTALL.OCTAVE ChangeLog: - (cd $(srcdir); hg log --style=changelog.tmpl --prune=b0e60ad4ae26ec2ca3567a17b29a53e0cd2051d8 --branch=`hg branch`; echo ""; echo "See the files in the OLD-ChangeLogs directory for older changes") > $@.t + (cd $(srcdir); hg log --style=changelog.tmpl --prune=b0e60ad4ae26 --only-branch=`hg branch`; echo ""; echo "See the files in the directory OLD-ChangeLogs for changes before 2011-04-19") > $@.t mv $@.t $@ .PHONY: ChangeLog
--- a/NEWS +++ b/NEWS @@ -56,6 +56,9 @@ * The Perl Compatible Regular Expression (PCRE) library is now required to build Octave. + * Octave's libraries and .oct files are now installed in + subdirectories of $libdir instead of $libexecdir. + Any future Octave 3.4.x release versions should remain binary compatible with Octave 3.4.1 as we are now using proper library versioning as recommended by the libtool manual. @@ -68,7 +71,7 @@ ** The following functions are new in 3.4.1: - colstyle iscolumn isrow + colstyle gmres iscolumn isrow mgorth nproc rectangle ** The get_forge_pkg function is now private. @@ -297,6 +300,11 @@ of `strcat' has been vectorized and is now much more efficient when many strings are concatenated. The `strcmpi' and `strncmpi' functions are now built-in functions, providing better performance. + + ** 'str2double' now has a compiled implementation and the API conforms + to Matlab. The additional Octave-specific features of returning a + boolean matrix indicating which elements were successfully converted + has been removed. ** Matlab-style ignoring input and output function arguments using tilde (~) is now supported. Ignored output arguments may be @@ -396,15 +404,15 @@ exponent where the exponent is a multiple of 3. ** The following functions are new in Octave 3.4: - accumdim divergence merge ppjumps strread - bitpack erfcx nfields pqpnonneg textread - bitunpack fileread nth_element quadcc uigetdir - blkmm fminbnd onCleanup randi uigetfile - cbrt fskipl pbaspect rectangle uiputfile - curl ifelse pie3 repelems uimenu - chop ishermitian powerset reset whitebg - colstyle isindex ppder rsf2csf - daspect luupdate ppint saveas + accumdim erfcx nfields pqpnonneg uigetdir + bitpack fileread nth_element quadcc uigetfile + bitunpack fminbnd onCleanup randi uiputfile + blkmm fskipl pbaspect repelems uimenu + cbrt ifelse pie3 reset whitebg + curl ishermitian powerset rsf2csf + chop isindex ppder saveas + daspect luupdate ppint strread + divergence merge ppjumps textread ** Using the image function to view images with external programs such as display, xv, and xloadimage is no longer supported. The @@ -506,9 +514,9 @@ be removed from Octave 3.8 (or whatever version is the second major release after 3.4): - autocor cellidx fstat is_global replot values - autocov cquad gammai krylovb saveimage - betai dispatch glpkmex perror strerror + autocor cellidx gammai krylovb saveimage + autocov dispatch glpkmex perror strerror + betai fstat is_global replot values Summary of important user-visible changes for version 3.2: ---------------------------------------------------------
--- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -25,7 +25,6 @@ .NOTPARALLEL: EXTRA_DIST = \ - ChangeLog \ Makefile.am \ texinfo.tex \ texmf.cnf
--- a/libcruft/Makefile.am +++ b/libcruft/Makefile.am @@ -92,7 +92,7 @@ ./mkf77def $(srcdir) $(libranlib_la_SOURCES) > $@-t mv $@-t $@ -EXTRA_DIST += ChangeLog mkf77def.in +EXTRA_DIST += mkf77def.in DISTCLEANFILES = cruft.def ranlib.def
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -25,7 +25,6 @@ -I$(top_srcdir)/libcruft/misc EXTRA_DIST = \ - ChangeLog \ config-ops.sh \ mk-ops.awk \ mx-op-inc.mk \
--- a/scripts/general/colon.m +++ b/scripts/general/colon.m @@ -34,5 +34,7 @@ ## @end deftypefn function r = colon (varargin) - error ("colon: not defined for class \"%s\"", class(varargin{1})); + if (nargin != 0) + error ("colon: not defined for class \"%s\"", class(varargin{1})); + endif endfunction
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,9 +20,6 @@ include $(top_srcdir)/common.mk -octlib_LTLIBRARIES = \ - liboctinterp.la - AM_CPPFLAGS = \ @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \ -I$(top_srcdir)/libcruft/misc \ @@ -31,6 +28,8 @@ AUTOMAKE_OPTIONS = subdir-objects +octlib_LTLIBRARIES = liboctinterp.la + ## Order matters here. Leave builtins.cc last, because it depends on ## $(DEF_FILES), and building those requires all the sources ## (except builtins.cc) to be available. @@ -52,9 +51,8 @@ oct-gperf.h \ oct-parse.h -## FIXME -- These files don't need to be distributed. Some of them -## do need to be installed. So we need to add them to a list somewhere -## so that happens correctly. +## Files that are created during build process and installed, +## BUT not distributed in tarball. BUILT_NODISTFILES = \ defaults.h \ graphics.h \ @@ -65,11 +63,10 @@ version.h \ $(OPT_HANDLERS) \ $(OPT_INC) \ - $(DEF_FILES) \ + $(ALL_DEF_FILES) \ builtins.cc EXTRA_DIST = \ - ChangeLog \ Makefile.in \ defaults.h.in \ DOCSTRINGS \ @@ -93,7 +90,7 @@ DLL_CDEFS = @OCTINTERP_DLL_DEFS@ DLL_CXXDEFS = @OCTINTERP_DLL_DEFS@ -.cc.df: +%.df: %.cc $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t @@ -106,13 +103,6 @@ LSODE-opts.cc \ Quad-opts.cc -OPT_IN = \ - ../liboctave/DASPK-opts.in \ - ../liboctave/DASRT-opts.in \ - ../liboctave/DASSL-opts.in \ - ../liboctave/LSODE-opts.in \ - ../liboctave/Quad-opts.in - OPT_INC = \ ../liboctave/DASPK-opts.h \ ../liboctave/DASRT-opts.h \ @@ -216,6 +206,13 @@ pt-walk.h \ pt.h +nodist_octinclude_HEADERS = \ + defaults.h \ + graphics.h \ + oct-conf.h \ + mxarray.h \ + version.h + octinclude_HEADERS = \ Cell.h \ base-list.h \ @@ -224,7 +221,6 @@ comment-list.h \ cutils.h \ debug.h \ - defaults.h \ defun-dld.h \ defun-int.h \ defun.h \ @@ -236,7 +232,6 @@ gl-render.h \ gl2ps.h \ gl2ps-renderer.h \ - graphics.h \ graphics-props.cc \ gripes.h \ help.h \ @@ -254,8 +249,6 @@ ls-utils.h \ mex.h \ mexproto.h \ - mxarray.h \ - oct-conf.h \ oct-errno.h \ oct-fstrm.h \ oct-gperf.h \ @@ -290,7 +283,6 @@ unwind-prot.h \ utils.h \ variables.h \ - version.h \ xdiv.h \ xnorm.h \ xpow.h \ @@ -610,12 +602,12 @@ gendoc.cc \ gendoc$(BUILD_EXEEXT) \ graphics-props.cc \ - oct-parse.output \ - $(BUILT_NODISTFILES) + oct-parse.output DISTCLEANFILES = \ .DOCSTRINGS \ DOCSTRINGS \ + $(BUILT_NODISTFILES) \ $(OCT_FILES) \ $(OCT_STAMP_FILES) @@ -755,7 +747,7 @@ $(OPT_INC) : %.h : %.in - $(MAKE) -C $(@D) $@ + $(MAKE) -C $(@D) $(@F) ## defaults.h and oct-conf.h must depend on Makefile. Calling configure ## may change default/config values. However, calling configure will also
--- a/src/oct-parse.yy +++ b/src/oct-parse.yy @@ -4012,8 +4012,8 @@ DEFUN (mfilename, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} mfilename ()\n\ -@deftypefnx {Built-in Function} {} mfilename (@code{\"fullpath\"})\n\ -@deftypefnx {Built-in Function} {} mfilename (@code{\"fullpathext\"})\n\ +@deftypefnx {Built-in Function} {} mfilename (\"fullpath\")\n\ +@deftypefnx {Built-in Function} {} mfilename (\"fullpathext\")\n\ Return the name of the currently executing file. At the top-level,\n\ return the empty string. Given the argument @code{\"fullpath\"},\n\ include the directory part of the file name, but not the extension.\n\
--- a/src/ov-cell.cc +++ b/src/ov-cell.cc @@ -1271,14 +1271,15 @@ DEFUN (cell, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} cell (@var{x})\n\ -@deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\ -Create a new cell array object. If invoked with a single scalar\n\ -argument, @code{cell} returns a square cell array with the dimension\n\ -specified. If you supply two scalar arguments, @code{cell} takes\n\ -them to be the number of rows and columns. If given a vector with two\n\ -elements, @code{cell} uses the values of the elements as the number of\n\ -rows and columns, respectively.\n\ +@deftypefn {Built-in Function} {} cell (@var{n})\n\ +@deftypefnx {Built-in Function} {} cell (@var{m}, @var{n})\n\ +@deftypefnx {Built-in Function} {} cell (@var{m}, @var{n}, @var{k}, @dots{})\n\ +@deftypefnx {Built-in Function} {} cell ([@var{m} @var{n} @dots{}])\n\ +Create a new cell array object.\n\ +If invoked with a single scalar integer argument, return a square\n\ +@nospell{NxN} cell array. If invoked with two or more scalar\n\ +integer arguments, or a vector of integer values, return an array with\n\ +the given dimensions.\n\ @end deftypefn") { octave_value retval;