Mercurial > hg > octave-max
changeset 3206:d0d2b69dc6c2
[project @ 1998-11-03 02:43:31 by jwe]
| author | jwe |
|---|---|
| date | Tue, 03 Nov 1998 02:44:40 +0000 |
| parents | 549691faa638 |
| children | dddfaa93a99c |
| files | ChangeLog install-octave.in liboctave/ChangeLog liboctave/Makefile.in liboctave/lo-mappers.cc src/ChangeLog src/Makefile.in src/data.cc src/mappers.cc |
| diffstat | 9 files changed, 86 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Nov 2 20:33:16 1998 John W. Eaton <jwe@bevo.che.wisc.edu> + + * install-octave.in (SHLEXT): Substitute. + (SHLEXT_VER): Define. + Use them for installing shared libraries. + Use subshells to avoid having to cd back to $distdir. + (distdir): Delete variable. + Fri Oct 2 14:23:59 1998 Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at> * octave-inf.el (inferior-octave-prompt): Also match prompts of
--- a/install-octave.in +++ b/install-octave.in @@ -37,8 +37,6 @@ exit 1 fi -distdir=`pwd` - # Check whether to use -n or \c to keep echo from printing a newline # character. Stolen from autoconf, which borrowed the idea from dist 3.0. @@ -58,6 +56,8 @@ fi EXE=@EXE@ +SHLEXT=@SHLEXT@ +SHLEXT_VER=$SHLEXT.$version # ==================== Where To Install Things ==================== @@ -234,8 +234,10 @@ for f in `cat LIBRARIES` do file=`basename $f` - cp $f $octlibdir/$file - chmod 644 $octlibdir/$file + cp $f $octlibdir/$file.$SHLEXT_VER + chmod 644 $octlibdir/$file.$SHLEXT_VER + ( cd $octlibdir + ln -s $file.$SHLEXT_VER $file.$SHLEXT ) done fi @@ -252,26 +254,23 @@ cat src/links-to-make | while read src dest do if test -n "$src" && test -n "$dest"; then - cd $octfiledir - ln $src $dest + ( cd $octfiledir + ln $src $dest ) fi done fi - cd $distdir fi echo "installing .m files in $fcnfiledir" -cd scripts -tar cf - . | ( cd $fcnfiledir ; tar xf - ) -find $fcnfiledir -type f -print | xargs chmod 0644 -find $fcnfiledir -name '*.img' -print | xargs rm -f -cd $distdir +( cd scripts + tar cf - . | ( cd $fcnfiledir ; tar xf - ) + find $fcnfiledir -type f -print | xargs chmod 0644 + find $fcnfiledir -name '*.img' -print | xargs rm -f ) echo "installing image files in $imagedir" -cd scripts/image -cp *.img $imagedir -chmod 644 $imagedir/*.img -cd $distdir +( cd scripts/image + cp *.img $imagedir + chmod 644 $imagedir/*.img ) echo "creating ls-R file in $datadir/octave" ls -LR $datadir/octave > $datadir/octave/ls-R
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,20 @@ +Mon Nov 2 13:36:04 1998 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (BINDISTLIBS): Don't include .$(SHLEXT_VER) in name. + + * Makefile.in (stmp-pic): New target. + ($(PICOBJ)): Depend on stmp-pic, not pic. + (clean): Remove stmp-pic + + * Makefile.in: Undo previous change to avoid optmization when + compiling lo-ieee.cc. + +Sun Nov 1 10:10:40 1998 John W. Eaton <jwe@bevo.che.wisc.edu> + + * lo-mappers.cc (xfinite): Define in terms of xfinite for real and + imaginary parts. + (xisinf): Define in terms of xisinf for real and imaginary parts. + Thu Oct 29 18:57:50 1998 John W. Eaton <jwe@bevo.che.wisc.edu> * boolMatrix.cc (boolMatrix::operator !): New function.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -95,8 +95,8 @@ DISTFILES := Makefile.in ChangeLog $(SOURCES) $(INCLUDES) $(EXTRAS) ifeq ($(SHARED_LIBS), true) - BINDISTFILES = liboctave.$(SHLEXT_VER) - BINDISTLIBS = liboctave/liboctave.$(SHLEXT_VER) + BINDISTLIBS = liboctave/liboctave + BINDISTFILES = $(addsuffix $(BINDISTLIBS), $(SHLEXT_VER)) endif MAKEDEPS_1 := $(patsubst %.cc, %.d, $(SOURCES)) @@ -118,6 +118,14 @@ all: libraries .PHONY: all +stmp-pic: pic + @if [ -f stmp-pic ]; then \ + true; \ + else \ + echo "touch stmp-pic"; \ + touch stmp-pic; \ + fi + pic: @if [ -d pic ]; then \ true; \ @@ -152,7 +160,7 @@ liboctave.$(SHLEXT_VER): $(PICOBJ) $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ -$(PICOBJ): pic +$(PICOBJ): stmp-pic check: all .PHONY: check @@ -208,6 +216,7 @@ clean: rm -f *.$(LIBEXT) *.o *.d pic/*.o -rmdir pic + rm -f stmp-pic if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi .PHONY: clean
--- a/liboctave/lo-mappers.cc +++ b/liboctave/lo-mappers.cc @@ -185,13 +185,13 @@ double xfinite (const Complex& x) { - return (! (xisinf (real (x)) || xisinf (imag (x)))); + return (xfinite (real (x)) && xfinite (imag (x))); } double xisinf (const Complex& x) { - return (! xfinite (x)); + return (xisinf (real (x)) || xisinf (imag (x))); } // Complex -> complex mappers.
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +Mon Nov 2 13:36:04 1998 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (stmp-pic): New target. + ($(PICOBJ)): Depend on stmp-pic, not pic. + (clean): Delete stmp-pic. + +Sun Nov 1 23:24:55 1998 John W. Eaton <jwe@bevo.che.wisc.edu> + + * mappers.cc (install_mapper_functions): Add alias for isfinite. + +Sat Oct 31 08:46:55 1998 John W. Eaton <jwe@bevo.che.wisc.edu> + + * data.cc (Fisnumeric): New function. + Fri Oct 30 08:39:30 1998 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-lvalue.cc (octave_lvalue::do_unary_op): Make it work for
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -181,8 +181,8 @@ $(INCLUDES) $(DIST_SRC) ifeq ($(SHARED_LIBS), true) - BINDISTFILES = octave $(OCT_FILES) liboctinterp.$(SHLEXT_VER) - BINDISTLIBS = src/liboctinterp.$(SHLEXT_VER) + BINDISTLIBS = src/liboctinterp + BINDISTFILES = $(addsuffix $(BINDISTLIBS), $(SHLEXT_VER)) else BINDISTFILES = octave $(OCT_FILES) endif @@ -394,7 +394,7 @@ $(addprefix $(srcdir)/, $(DLD_SRC)) \ > ../`cat ../.fname`/src/links-to-make; \ fi - if [ -n "$(BINDISTLIBS)" ]; then \ + if [ -n "$(BINDISTLIBNS)" ]; then \ echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES; \ fi .PHONY: bin-dist
--- a/src/data.cc +++ b/src/data.cc @@ -786,6 +786,19 @@ return retval; } +DEFUN (isnumeric, args, , + "isnumeric (x): return nonzero if x is a numeric object") +{ + octave_value retval; + + if (args.length () == 1) + retval = args(0).is_numeric_type () ? 1.0 : 0.0; + else + print_usage ("is_list"); + + return retval; +} + DEFUN (is_list, args, , "is_list (x): return nonzero if x is a list") {