Mercurial > octave-nkf
changeset 4472:f52db9e1296a
[project @ 2003-07-29 18:03:03 by jwe]
| author | jwe |
|---|---|
| date | Tue, 29 Jul 2003 18:03:03 +0000 |
| parents | 6a1e6e87f143 |
| children | 32ac2bea0185 |
| files | libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in src/oct-procbuf.cc |
| diffstat | 7 files changed, 59 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog Mon Jul 28 21:08:06 2003 +0000 +++ b/libcruft/ChangeLog Tue Jul 29 18:03:03 2003 +0000 @@ -1,3 +1,8 @@ +2003-07-29 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (install-lib): Use $(INSTALL), not + $(INSTALL_PROGRAM) for $(SHLBIN) files. + 2003-07-02 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (CLEAN_SUBDIRS): New variable.
--- a/libcruft/Makefile.in Mon Jul 28 21:08:06 2003 +0000 +++ b/libcruft/Makefile.in Tue Jul 29 18:03:03 2003 +0000 @@ -138,7 +138,7 @@ $(LN_S) libcruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB); \ if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \ - $(INSTALL_PROGRAM) \ + $(INSTALL) \ libcruft.$(SHLBIN) $(DESTDIR)$(bindir)/libcruft.$(SHLBIN); \ fi; \ fi
--- a/liboctave/ChangeLog Mon Jul 28 21:08:06 2003 +0000 +++ b/liboctave/ChangeLog Tue Jul 29 18:03:03 2003 +0000 @@ -1,3 +1,8 @@ +2003-07-29 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (install-lib): Use $(INSTALL), not + $(INSTALL_PROGRAM) for $(SHLBIN) files. + 2003-07-25 John W. Eaton <jwe@bevo.che.wisc.edu> * lo-mappers.cc (xmin, xmax): Handle NaN in a Matlab-compatible
--- a/liboctave/Makefile.in Mon Jul 28 21:08:06 2003 +0000 +++ b/liboctave/Makefile.in Tue Jul 29 18:03:03 2003 +0000 @@ -253,7 +253,7 @@ $(LN_S) liboctave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB); \ if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \ - $(INSTALL_PROGRAM) \ + $(INSTALL) \ liboctave.$(SHLBIN) $(DESTDIR)$(bindir)/liboctave.$(SHLBIN); \ fi; \ fi
--- a/src/ChangeLog Mon Jul 28 21:08:06 2003 +0000 +++ b/src/ChangeLog Tue Jul 29 18:03:03 2003 +0000 @@ -1,3 +1,13 @@ +2003-07-29 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (install-lib): Use $(INSTALL), not + $(INSTALL_PROGRAM) for $(SHLBIN) files. + +2003-07-29 Paul Kienzle <pkienzle@users.sf.net> + + * Makefile.in: Don't need special system.c for Cygwin. + * oct-procbuf.cc: Use popen rather than fork/exec for Windows. + 2003-07-28 Paul Kienzle <pkienzle@users.sf.net> * sysdep.cc (CYGWIN_init): Convert TMPDIR to system agnostic path.
--- a/src/Makefile.in Mon Jul 28 21:08:06 2003 +0000 +++ b/src/Makefile.in Tue Jul 29 18:03:03 2003 +0000 @@ -129,7 +129,7 @@ oct-strstrm.cc oct-lvalue.cc pager.cc parse.y \ pr-output.cc procstream.cc sighandlers.cc \ siglist.c strcasecmp.c strncase.c strfns.cc symtab.cc \ - syscalls.cc sysdep.cc system.c token.cc toplev.cc \ + syscalls.cc sysdep.cc token.cc toplev.cc \ unwind-prot.cc utils.cc variables.cc xdiv.cc xpow.cc \ $(OV_SRC) \ $(PT_SRC) @@ -372,7 +372,7 @@ $(LN_S) liboctinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLLIB); \ if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \ - $(INSTALL_PROGRAM) \ + $(INSTALL) \ liboctinterp.$(SHLBIN) $(DESTDIR)$(bindir)/liboctinterp.$(SHLBIN); \ fi; \ fi
--- a/src/oct-procbuf.cc Mon Jul 28 21:08:06 2003 +0000 +++ b/src/oct-procbuf.cc Tue Jul 29 18:03:03 2003 +0000 @@ -56,7 +56,28 @@ octave_procbuf * octave_procbuf::open (const char *command, int mode) { -#if defined (HAVE_SYS_WAIT_H) +#if defined (__CYGWIN32__) + + if (is_open ()) + return 0; + + f = popen (command, (mode & std::ios::in) ? "r" : "w"); + + if (! f) + return 0; + + // Oops... popen doesn't return the associated pid, so fake it for now + + proc_pid = 1; + + open_p = true; + + if (mode & std::ios::out) + ::setvbuf (f, 0, _IOLBF, 0); + + return this; + +#elif defined (HAVE_SYS_WAIT_H) int pipe_fds[2]; @@ -144,7 +165,19 @@ octave_procbuf * octave_procbuf::close (void) { -#if defined (HAVE_SYS_WAIT_H) +#if defined (__CYGWIN32__) + + if (f) + { + wstatus = ::pclose (f); + f = 0; + } + + open_p = false; + + return this; + +#elif defined (HAVE_SYS_WAIT_H) if (f) {