Mercurial > octave-nkf
changeset 6126:c0011bf8f815
[project @ 2006-10-31 20:08:30 by jwe]
| author | jwe |
|---|---|
| date | Tue, 31 Oct 2006 20:10:39 +0000 |
| parents | a1754033bc6c |
| children | 5ea7e62233f2 |
| files | doc/ChangeLog doc/interpreter/Makefile.in doc/interpreter/sparseimages.m libcruft/ChangeLog libcruft/misc/Makefile.in |
| diffstat | 5 files changed, 24 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog Sun Oct 29 17:05:53 2006 +0000 +++ b/doc/ChangeLog Tue Oct 31 20:10:39 2006 +0000 @@ -1,3 +1,8 @@ +2006-10-29 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (run-octave): Call it here. + * interpreter/sparseimages.m (sparseimages): Don't call sleep here. + 2006-10-27 John W. Eaton <jwe@octave.org> * interpreter/Makefile.in (run-octave):
--- a/doc/interpreter/Makefile.in Sun Oct 29 17:05:53 2006 +0000 +++ b/doc/interpreter/Makefile.in Tue Oct 31 20:10:39 2006 +0000 @@ -147,10 +147,12 @@ $(INSTALL_DATA) $(filter-out html-dir, $<) HTML ## Unset DISPLAY here to avoid problems with the -title option for -## gnuplot (it doesn't work if we are calling pgnuplot). +## gnuplot (it doesn't work if we are calling pgnuplot). Sleep for +## a second to allow gnuplot to finish writing its output before +## Octave exits. define run-octave DISPLAY= $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \ - --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))')" + --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))'); sleep (1);" endef $(SPARSEIMAGES_EPS) $(SPARSEIMAGES_PNG) $(SPARSEIMAGES_TXT): sparseimages.m
--- a/doc/interpreter/sparseimages.m Sun Oct 29 17:05:53 2006 +0000 +++ b/doc/interpreter/sparseimages.m Tue Oct 31 20:10:39 2006 +0000 @@ -1,22 +1,18 @@ -function sparseimages(nm,typ) +function sparseimages (nm, typ) if (! isempty (findstr (octave_config_info ("DEFS"), "HAVE_COLAMD")) && ! isempty (findstr (octave_config_info ("DEFS"), "HAVE_CHOLMOD")) && ! isempty (findstr (octave_config_info ("DEFS"), "HAVE_UMFPACK"))) - if (strcmp(typ,"txt")) - txtimages (nm, 15, typ); - else - if (strcmp (nm, "gplot")) - gplotimages ("gplot", typ); - elseif (strcmp (nm, "grid")) - femimages ("grid", typ); + if (strcmp(typ,"txt")) + txtimages (nm, 15, typ); else - otherimages (nm, 200, typ); + if (strcmp (nm, "gplot")) + gplotimages ("gplot", typ); + elseif (strcmp (nm, "grid")) + femimages ("grid", typ); + else + otherimages (nm, 200, typ); + endif endif - endif - ## Kluge to give gnuplot enough time to process last figure before we - ## exit. Otherwise, Octave will delete the temporary data files when - ## it exits and gnuplot will fail... - sleep (1); else ## There is no sparse matrix implementation available because ## of missing libraries, plot sombreros instead sombreroimage (nm, typ);
--- a/libcruft/ChangeLog Sun Oct 29 17:05:53 2006 +0000 +++ b/libcruft/ChangeLog Tue Oct 31 20:10:39 2006 +0000 @@ -1,3 +1,7 @@ +2006-10-31 John W. Eaton <jwe@octave.org> + + * misc/Makefile.in (INCLUDES): Add oct-dlldefs.h to the list. + 2006-10-29 John W. Eaton <jwe@octave.org> * misc/Makefile.in (SPECIAL_INCLUDE): Add oct-dlldefs.h to the list.
--- a/libcruft/misc/Makefile.in Sun Oct 29 17:05:53 2006 +0000 +++ b/libcruft/misc/Makefile.in Tue Oct 31 20:10:39 2006 +0000 @@ -31,7 +31,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INCLUDES := f77-fcn.h lo-error.h quit.h +INCLUDES := f77-fcn.h lo-error.h oct-dlldefs.h quit.h ifeq ($(SHARED_LIBS), true) ifdef CPICFLAG