Mercurial > octave-nkf
changeset 4299:02fcb550f20c
[project @ 2003-01-16 20:15:14 by jwe]
| author | jwe |
|---|---|
| date | Thu, 16 Jan 2003 20:15:15 +0000 |
| parents | 055d2f68d445 |
| children | a370ad9112dd |
| files | ChangeLog Makeconf.in liboctave/ChangeLog liboctave/oct-syscalls.cc src/ChangeLog src/Makefile.in src/mk-oct-links src/mkbuiltins src/mkdefs src/mkdocs src/mkgendoc src/mkops |
| diffstat | 12 files changed, 48 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 13 15:10:39 2003 +0000 +++ b/ChangeLog Thu Jan 16 20:15:15 2003 +0000 @@ -1,3 +1,7 @@ +2003-01-16 Mumit Khan <khan@nanotech.wisc.edu> + + * Makeconf.in (SED): Export to subshells. + 2003-01-11 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in: Don't bother with compiler flags for
--- a/Makeconf.in Mon Jan 13 15:10:39 2003 +0000 +++ b/Makeconf.in Thu Jan 16 20:15:15 2003 +0000 @@ -10,6 +10,7 @@ SHELL = /bin/sh SED = @SED@ +export SED # A shell command to extract the version number from version.h. getversion = $(SED) -e '/VERSION/!d' -e 's/.*"\(.*\)".*$$/\1/' -e q
--- a/liboctave/ChangeLog Mon Jan 13 15:10:39 2003 +0000 +++ b/liboctave/ChangeLog Thu Jan 16 20:15:15 2003 +0000 @@ -1,3 +1,7 @@ +2003-01-16 Mumit Khan <khan@nanotech.wisc.edu> + + * oct-syscalls.cc: Include signal.h. + 2003-01-10 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-syscalls.cc (octave_syscalls::kill): New function.
--- a/liboctave/oct-syscalls.cc Mon Jan 13 15:10:39 2003 +0000 +++ b/liboctave/oct-syscalls.cc Thu Jan 16 20:15:15 2003 +0000 @@ -40,6 +40,11 @@ #include <fcntl.h> #endif +// We can't use csignal as kill is not in the std namespace, and picky +// compiler runtimes will also exclude it from global scope as well. + +#include <signal.h> + #include "oct-syscalls.h" #include "str-vec.h" #include "syswait.h"
--- a/src/ChangeLog Mon Jan 13 15:10:39 2003 +0000 +++ b/src/ChangeLog Thu Jan 16 20:15:15 2003 +0000 @@ -1,3 +1,12 @@ +2003-01-16 Mumit Khan <khan@nanotech.wisc.edu> + + * mk-oct-links: Use $SED if set. + * mkbuiltins: Likewise. + * mkdefs: Likewise. + * mkdocs: Likewise. + * mkgendoc: Likewise. + * mkops: Likewise. + 2003-01-11 Paul Kienzle <pkienzle@users.sf.net> * Makefile.in (gendoc$(BUILD_EXEEXT)): Pass $(BUILD_CXXFLAGS) and
--- a/src/Makefile.in Mon Jan 13 15:10:39 2003 +0000 +++ b/src/Makefile.in Thu Jan 16 20:15:15 2003 +0000 @@ -315,7 +315,7 @@ @$(top_srcdir)/move-if-change $@-t $@ gendoc$(BUILD_EXEEXT): gendoc.cc - $(BUILD_CXX) -o $@ $^ + $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS) ops.cc: $(OP_SRC) mkops @echo making $@ from $(OP_SRC)
--- a/src/mk-oct-links Mon Jan 13 15:10:39 2003 +0000 +++ b/src/mk-oct-links Thu Jan 16 20:15:15 2003 +0000 @@ -10,6 +10,8 @@ # .df files corresponding to the source files that were used to # create the .oct files. +SED=${SED:-'sed'} + print_only=false if [ $1 = "-p" ]; then print_only=true @@ -20,9 +22,9 @@ shift for f in "$@"; do - base=`basename $f | sed 's/\.df$//'` + base=`basename $f | $SED 's/\.df$//'` fcns=`grep '^ *XDEFUN_DLD_INTERNAL' $f |\ - sed -e 's/XDEFUN_DLD_INTERNAL *( *//' -e 's/ *,.*$//' |\ + $SED -e 's/XDEFUN_DLD_INTERNAL *( *//' -e 's/ *,.*$//' |\ sort -u` if [ -n "$fcns" ]; then for n in $fcns; do
--- a/src/mkbuiltins Mon Jan 13 15:10:39 2003 +0000 +++ b/src/mkbuiltins Thu Jan 16 20:15:15 2003 +0000 @@ -5,6 +5,8 @@ exit 1 fi +SED=${SED:-'sed'} + DEF_FILES=`cat $1` VAR_FILES=`cat $2` @@ -68,7 +70,7 @@ EOF for file in $DEF_FILES; do - fcn=`echo $file | sed 's,^\./,,; s/\.df//; s/-/_/g'` + fcn=`echo $file | $SED 's,^\./,,; s/\.df//; s/-/_/g'` echo "static void" echo "install_${fcn}_fcns (void)" echo "{" @@ -78,7 +80,7 @@ done for file in $VAR_FILES; do - f=`echo $file | sed 's,^\./,,; s/-/_/g'` + f=`echo $file | $SED 's,^\./,,; s/-/_/g'` echo "extern void symbols_of_${f} (void);" done @@ -90,7 +92,7 @@ EOF for file in $VAR_FILES; do - f=`echo $file | sed 's,^\./,,; s/-/_/g'` + f=`echo $file | $SED 's,^\./,,; s/-/_/g'` echo " symbols_of_${f} ();" done @@ -103,7 +105,7 @@ EOF for file in $DEF_FILES; do - fcn=`echo $file | sed 's,^\./,,; s/\.df//; s/-/_/g'` + fcn=`echo $file | $SED 's,^\./,,; s/\.df//; s/-/_/g'` echo " install_${fcn}_fcns ();" done
--- a/src/mkdefs Mon Jan 13 15:10:39 2003 +0000 +++ b/src/mkdefs Thu Jan 16 20:15:15 2003 +0000 @@ -1,6 +1,8 @@ #!/bin/sh -sed -n -e '/^ *BEGIN_INSTALL_BUILTIN/{ +SED=${SED:-'sed'} + +$SED -n -e '/^ *BEGIN_INSTALL_BUILTIN/{ : loop s/BEGIN_INSTALL_BUILTIN// s/^#[ \t][ \t]*[0-9][0-9]*.*$//
--- a/src/mkdocs Mon Jan 13 15:10:39 2003 +0000 +++ b/src/mkdocs Thu Jan 16 20:15:15 2003 +0000 @@ -1,6 +1,8 @@ #!/bin/sh -sed -n -e '/^BEGIN_DOC_STRING/{ +SED=${SED:-'sed'} + +$SED -n -e '/^BEGIN_DOC_STRING/{ : loop N /END_DOC_STRING/b done
--- a/src/mkgendoc Mon Jan 13 15:10:39 2003 +0000 +++ b/src/mkgendoc Thu Jan 16 20:15:15 2003 +0000 @@ -1,5 +1,7 @@ #! /bin/sh +SED=${SED:-'sed'} + if test $# -ne 1; then echo "usage: mkgendoc f1" 1>&2 exit 1 @@ -67,7 +69,7 @@ EOF for file in $DOC_FILES; do - fcn=`echo $file | sed 's,^\./,,; s/\.df//; s/-/_/g'` + fcn=`echo $file | $SED 's,^\./,,; s/\.df//; s/-/_/g'` echo "static void" echo "print_${fcn}_doc_strings (void)" echo "{" @@ -84,7 +86,7 @@ EOF for file in $DOC_FILES; do - fcn=`echo $file | sed 's,^\./,,; s/\.df//; s/-/_/g'` + fcn=`echo $file | $SED 's,^\./,,; s/\.df//; s/-/_/g'` echo " print_${fcn}_doc_strings ();" done
--- a/src/mkops Mon Jan 13 15:10:39 2003 +0000 +++ b/src/mkops Thu Jan 16 20:15:15 2003 +0000 @@ -1,5 +1,7 @@ #!/bin/sh +SED=${SED:-'sed'} + cat << \EOF // DO NOT EDIT! Generated automatically by mkbuiltins. @@ -12,7 +14,7 @@ EOF for file in "$@"; do - f=`echo $file | sed 's,^\./,,; s%^OPERATORS/op-%%; s%\.cc%%; s%-%_%g'` + f=`echo $file | $SED 's,^\./,,; s%^OPERATORS/op-%%; s%\.cc%%; s%-%_%g'` echo "extern void install_${f}_ops (void);" done @@ -26,7 +28,7 @@ EOF for file in "$@"; do - f=`echo $file | sed 's,^\./,,; s%^OPERATORS/op-%%; s%\.cc%%; s%-%_%g'` + f=`echo $file | $SED 's,^\./,,; s%^OPERATORS/op-%%; s%\.cc%%; s%-%_%g'` echo " install_${f}_ops ();" done