Mercurial > octave-nkf
changeset 6125:a1754033bc6c
[project @ 2006-10-29 17:05:53 by jwe]
| author | jwe |
|---|---|
| date | Sun, 29 Oct 2006 17:05:53 +0000 |
| parents | 58f46c6f0d51 |
| children | c0011bf8f815 |
| files | ChangeLog libcruft/ChangeLog libcruft/misc/Makefile.in run-octave.in src/ChangeLog src/ls-mat5.cc |
| diffstat | 6 files changed, 45 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 28 16:30:52 2006 +0000 +++ b/ChangeLog Sun Oct 29 17:05:53 2006 +0000 @@ -1,3 +1,7 @@ +2006-10-29 John W. Eaton <jwe@octave.org> + + * run-octave.in: Handle spaces in directory names. + 2006-10-28 Michael Goffioul <michael.goffioul@swing.be> * configure.in (AH_BOTTOM): If using MSVC, define __WIN32__ before
--- a/libcruft/ChangeLog Sat Oct 28 16:30:52 2006 +0000 +++ b/libcruft/ChangeLog Sun Oct 29 17:05:53 2006 +0000 @@ -1,3 +1,7 @@ +2006-10-29 John W. Eaton <jwe@octave.org> + + * misc/Makefile.in (SPECIAL_INCLUDE): Add oct-dlldefs.h to the list. + 2006-10-28 Michael Goffioul <michael.goffioul@swing.be> * misc/quit.h: Undefine min and max after including windows.h.
--- a/libcruft/misc/Makefile.in Sat Oct 28 16:30:52 2006 +0000 +++ b/libcruft/misc/Makefile.in Sun Oct 29 17:05:53 2006 +0000 @@ -17,7 +17,7 @@ DEP_1 := $(patsubst %.c, %.d, $(SPECIAL_SRC)) MAKEDEPS := $(patsubst %.cc, %.d, $(DEP_1)) -SPECIAL_INCLUDE := f77-fcn.h lo-error.h quit.h +SPECIAL_INCLUDE := f77-fcn.h lo-error.h oct-dlldefs.h quit.h SPECIAL:= d1mach-tst.for $(SPECIAL_SRC) $(SPECIAL_INCLUDE)
--- a/run-octave.in Sat Oct 28 16:30:52 2006 +0000 +++ b/run-octave.in Sun Oct 29 17:05:53 2006 +0000 @@ -1,15 +1,33 @@ #! /bin/sh -top_srcdir=%abs_top_srcdir% -builddir=%builddir% -## FIXME -- this will fail for filenames with embedded spaces... -dirs="$top_srcdir/test $top_srcdir/scripts $builddir/scripts $builddir/src" -dirs=$(find $dirs -type d -a ! \( \( -name CVS -o -name private \) -a -prune \)) -for d in $dirs; do - LOADPATH=$LOADPATH:$d -done -LOADPATH=$(echo $LOADPATH | sed 's|^:||') + +AWK=${AWK:-'awk'} + +# FIXME -- is there a better way to handle the possibility of spaces +# in these names? + +top_srcdir="%abs_top_srcdir%" +builddir="%builddir%" + +d1="$top_srcdir/test" +d2="$top_srcdir/scripts" +d3="$builddir/scripts" +d4="$builddir/src" + +d1_list=$(find "$d1" -type d -a ! \( \( -name CVS -o -name private \) -a -prune \) -exec echo '{}': ';') +d2_list=$(find "$d2" -type d -a ! \( \( -name CVS -o -name private \) -a -prune \) -exec echo '{}': ';') +d3_list=$(find "$d3" -type d -a ! \( \( -name CVS -o -name private \) -a -prune \) -exec echo '{}': ';') +d4_list=$(find "$d4" -type d -a ! \( \( -name CVS -o -name private \) -a -prune \) -exec echo '{}': ';') + +d1_path=$(echo "$d1_list" | $AWK '{ s = sprintf ("%s%s", s, $0); } END { sub (/:$/, "", s); print s; }') +d2_path=$(echo "$d2_list" | $AWK '{ s = sprintf ("%s%s", s, $0); } END { sub (/:$/, "", s); print s; }') +d3_path=$(echo "$d3_list" | $AWK '{ s = sprintf ("%s%s", s, $0); } END { sub (/:$/, "", s); print s; }') +d4_path=$(echo "$d4_list" | $AWK '{ s = sprintf ("%s%s", s, $0); } END { sub (/:$/, "", s); print s; }') + +LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path" IMAGEPATH="$top_srcdir/scripts/image" -args="--path=$LOADPATH --image-path=$IMAGEPATH" + +args="--path=\"$LOADPATH\" --image-path=\"$IMAGEPATH\"" + if [ $# -gt 0 ]; then if [ "x$1" = "x-g" ]; then driver="gdb" @@ -27,7 +45,8 @@ shift fi fi -OCTAVE_SITE_INITFILE=$top_srcdir/scripts/startup/main-rcfile \ + +OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ %library_path_var%="$builddir/src:$builddir/liboctave:$builddir/libcruft:$%library_path_var%" \ - exec $driver $builddir/src/octave $args "$@" + exec $driver "$builddir/src/octave" "$args" "$@"
--- a/src/ChangeLog Sat Oct 28 16:30:52 2006 +0000 +++ b/src/ChangeLog Sun Oct 29 17:05:53 2006 +0000 @@ -1,3 +1,7 @@ +2006-10-29 Juhani Saastamoinen <juhani@cs.joensuu.fi> + + * ls-mat5.cc (read_mat5_tag): Declare bytes as int32_t, not just int. + 2006-10-28 John W. Eaton <jwe@octave.org> * toplev.cc (Fatexit): Push function names on the stack even if we
--- a/src/ls-mat5.cc Sat Oct 28 16:30:52 2006 +0000 +++ b/src/ls-mat5.cc Sun Oct 29 17:05:53 2006 +0000 @@ -335,7 +335,7 @@ // place the type code in TYPE and the byte count in BYTES // return nonzero on error static int -read_mat5_tag (std::istream& is, bool swap, int32_t& type, int& bytes) +read_mat5_tag (std::istream& is, bool swap, int32_t& type, int32_t& bytes) { unsigned int upper; int32_t temp;