Mercurial > octave-nkf

changeset 6366:06f26e174fc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-02-28 19:16:49 by jwe]
author jwe
date Wed, 28 Feb 2007 19:16:49 +0000
parents ccdb8ffbb994
children 268bfc8a2755
files ChangeLog Makeconf.in doc/interpreter/Makefile.in examples/Makefile.in liboctave/ChangeLog liboctave/Makefile.in scripts/ChangeLog scripts/general/interp1.m scripts/plot/__uiobject_draw_axes__.m src/ChangeLog src/Makefile.in
diffstat 11 files changed, 54 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 27 19:43:36 2007 +0000
+++ b/ChangeLog	Wed Feb 28 19:16:49 2007 +0000
@@ -1,5 +1,10 @@
 2007-02-27  John W. Eaton  <jwe@octave.org>
 
+	* Makeconf.in (do-script-uninstall): Remove PKG_ADD.
+	* examples/Makefile.in (uninstall): Don't remove files listed in
+	$(SCRIPTS) from $(srcdir).
+	Remove www.octave.org-octave.desktop, not octave.desktop.
+
 	* run-octave.in (run-octave.in): Use --no-initial-path.
 	Rename to qargs to args.  Use $args not "$args" when invoking Octave.
 	Try harder to get quoting right when passing args to Octave.
--- a/Makeconf.in	Tue Feb 27 19:43:36 2007 +0000
+++ b/Makeconf.in	Wed Feb 28 19:16:49 2007 +0000
@@ -635,4 +635,5 @@
 for f in $(FCN_FILES_NO_DIR); \
   do rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \
 done
+rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD
 endef
--- a/doc/interpreter/Makefile.in	Tue Feb 27 19:43:36 2007 +0000
+++ b/doc/interpreter/Makefile.in	Wed Feb 28 19:16:49 2007 +0000
@@ -33,7 +33,7 @@
 IMAGES_TXT = $(SPARSEIMAGES_TXT)
 
 HTML_IMAGES_PNG = $(addprefix HTML/, $(IMAGES_PNG))
-  
+
 IMAGES = $(IMAGES_EPS) $(IMAGES_PDF) $(IMAGES_PNG) $(IMAGES_TXT)
 
 SUB_SOURCE := arith.txi audio.txi basics.txi bugs.txi \
--- a/examples/Makefile.in	Tue Feb 27 19:43:36 2007 +0000
+++ b/examples/Makefile.in	Wed Feb 28 19:16:49 2007 +0000
@@ -59,13 +59,13 @@
 
 uninstall:
 	for f in $(SCRIPTS); do \
-	  rm -f $(srcdir)/$$f $(DESTDIR)$(archlibdir)/$$f; \
+	  rm -f $(DESTDIR)$(archlibdir)/$$f; \
 	done
 	for f in $(IMAGE_FILES_NO_DIR); do \
 	  rm -f $(DESTDIR)$(imagedir)/$$f; \
 	done
 	if test -n "$(DESKTOP_FILE_INSTALL)"; then \
-	  rm -f $(DESTDIR)$(datadir)/applications/octave.desktop; \
+	  rm -f $(DESTDIR)$(datadir)/applications/www.octave.org-octave.desktop; \
 	fi
 .PHONY: uninstall
 
--- a/liboctave/ChangeLog	Tue Feb 27 19:43:36 2007 +0000
+++ b/liboctave/ChangeLog	Wed Feb 28 19:16:49 2007 +0000
@@ -1,3 +1,9 @@
+2007-02-27  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (uninstall): Delete files listed in
+	$(INCLUDES_FOR_INSTALL), instead of $(INCLUDES).
+	From Thomas Treichl <Thomas.Treichl@gmx.net>.
+
 2007-02-27  From Michael Goffioul  <michael.goffioul@swing.be>
 
 	* file-ops.cc (file_ops::recursive_rmdir):
--- a/liboctave/Makefile.in	Tue Feb 27 19:43:36 2007 +0000
+++ b/liboctave/Makefile.in	Wed Feb 28 19:16:49 2007 +0000
@@ -302,7 +302,7 @@
 	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \
 	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN_VER); \
 	fi
-	for f in $(INCLUDES); do rm -f $(DESTDIR)$(octincludedir)/octave/$$f; done
+	for f in $(INCLUDES_FOR_INSTALL); do rm -f $(DESTDIR)$(octincludedir)/octave/$$f; done
 .PHONY: uninstall
 
 tags: $(SOURCES)
--- a/scripts/ChangeLog	Tue Feb 27 19:43:36 2007 +0000
+++ b/scripts/ChangeLog	Wed Feb 28 19:16:49 2007 +0000
@@ -1,3 +1,12 @@
+2007-02-28  John W. Eaton  <jwe@octave.org>
+
+	* plot/__uiobject_draw_axes__.m: Use fullfile to generate
+	temporary file names.  Keep image and colormap file ids separate.
+
+	* general/interp1.m: Correctly compute min and max values when
+	values are decreasing and not evenly spaced.
+	From Ricardo Marranita <ricardo.marranita@gmail.com>.
+
 2007-02-27  John W. Eaton  <jwe@octave.org>
 
 	* testfun/test.m (test): Handle possibility of file_in_loadpath
--- a/scripts/general/interp1.m	Tue Feb 27 19:43:36 2007 +0000
+++ b/scripts/general/interp1.m	Wed Feb 28 19:16:49 2007 +0000
@@ -145,11 +145,14 @@
   ## unless extrap=="extrap" in which case, extrapolate them like we
   ## should be doing in the first place.
   minx = x(1);
+  maxx = x(nx);
+  if (minx > maxx)
+    tmp = minx;
+    minx = maxx;
+    maxx = tmp;
+  endif
   if (method(1) == "*")
-     dx = x(2) - x(1);
-     maxx = minx + (ny-1)*dx;
-  else
-     maxx = x(nx);
+    dx = x(2) - x(1);
   endif
 
   if (! pp)
--- a/scripts/plot/__uiobject_draw_axes__.m	Tue Feb 27 19:43:36 2007 +0000
+++ b/scripts/plot/__uiobject_draw_axes__.m	Wed Feb 28 19:16:49 2007 +0000
@@ -274,13 +274,13 @@
 
 	    ## Let the file be deleted when Octave exits or `purge_tmp_files'
 	    ## is called.
-	    [fid, fname] = mkstemp (strcat (P_tmpdir, "/gpimageXXXXXX"), 1);
+	    [img_fid, img_fname] = mkstemp (fullfile (P_tmpdir, "gpimageXXXXXX"), 1);
 	    if (ndims (img_data) == 3)
-	      fwrite (fid, permute (img_data, [3, 1, 2])(:), "float");
+	      fwrite (img_fid, permute (img_data, [3, 1, 2])(:), "float");
 	      format = "1:2:3";
 	      imagetype = "rgbimage";
 	    else
-	      fwrite (fid, img_data(:), "float");
+	      fwrite (img_fid, img_data(:), "float");
 	      format = "1";
 	      imagetype = "image";
 	      ## Only need to set pallete once because it doesn't change
@@ -302,18 +302,18 @@
 		else
 		  ## Let the file be deleted when Octave exits or
 		  ## `purge_tmp_files' is called.
-		  [fid, binary_fname, msg] = mkstemp (strcat (P_tmpdir, "/gpimageXXXXXX"), 1);
-		  fwrite (fid, img_colormap', "float32", 0, "ieee-le");
-		  fclose (fid);
+		  [cmap_fid, cmap_fname, msg] = mkstemp (fullfile (P_tmpdir, "gpimageXXXXXX"), 1);
+		  fwrite (cmap_fid, img_colormap', "float32", 0, "ieee-le");
+		  fclose (cmap_fid);
 		  fprintf (plot_stream,
 			   "set palette file \"%s\" binary record=%d using 1:2:3;\n",
-			   binary_fname, palette_size);
+			   cmap_fname, palette_size);
 		endif
 	      endif
 	    endif
-	    fclose (fid);
+	    fclose (img_fid);
 
-	    filespec{data_idx} = fname;
+	    filespec{data_idx} = img_fname;
 	    titlespec{data_idx} = "";
 	    usingclause{data_idx} = sprintf ("binary array=%dx%d scan=yx flipy origin=(%g,%g) dx=%g dy=%g using %s",
 		x_dim, y_dim, x_origin, y_origin, dx, dy, format);
--- a/src/ChangeLog	Tue Feb 27 19:43:36 2007 +0000
+++ b/src/ChangeLog	Wed Feb 28 19:16:49 2007 +0000
@@ -1,5 +1,9 @@
 2007-02-27  John W. Eaton  <jwe@octave.org>
 
+	* Makefile.in (uninstall): Also remove octave-$(version)$(EXEEXT), 
+	oct-gperf.h, and all .oct files.  Remove PKG_ADD.
+	From Thomas Treichl <Thomas.Treichl@gmx.net>.
+
 	* load-path.h, (load_path::initialize, load_path::do_initialize):
 	New arg, set_initial_path.
 	* load-path.cc (load_path::do_initialize): Don't add system
--- a/src/Makefile.in	Tue Feb 27 19:43:36 2007 +0000
+++ b/src/Makefile.in	Wed Feb 28 19:16:49 2007 +0000
@@ -451,6 +451,7 @@
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
 	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT)
 	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB)
 	rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB_VER)
@@ -458,9 +459,16 @@
 	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \
 	  rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN_VER); \
 	fi
-	for f in $(INCLUDES_FOR_INSTALL) defaults.h oct-conf.h; do \
+	for f in $(INCLUDES_FOR_INSTALL) defaults.h oct-conf.h oct-gperf.h; do \
 	  rm -f $(DESTDIR)$(octincludedir)/octave/$$f; \
 	done
+	if [ -n "$(OCT_FILES)" ]; then \
+	  xfiles="$(OCT_FILES)"; \
+	  for f in $$xfiles; do \
+	    rm -f $(DESTDIR)$(octfiledir)/$$f; \
+	  done; \
+	fi
+	rm -f $(DESTDIR)$(octfiledir)/PKG_ADD
 .PHONY: uninstall
 
 tags: $(SOURCES) $(DLD_SRC)