Mercurial > octave-nkf
view run-octave.in @ 17778:b5d58667d32d
new main program wrapper to handle giving up controlling tty
* octave-gui.cc (octave_cli_thread): New class, from QtHandles.
(dissociate_terminal): Delete.
(octave_start_gui): Third arg is now START_GUI instead of FORK.
Don't call dissociate_terminal. If start_gui is false, use
octave_cli_thread to start Octave within a QApplication context.
* sighandlers.cc (gui_driver_sig_handler): Move to src/main.in.cc.
(install_gui_driver_signal_handlers): Move to src/main.in.cc and rename
to octave_set_signal_handler.
* octave.cc (no_fork_option): Delete.
(process_command_line): Don't handle NO_FORK_OPTION.
(octave_fork_gui): Move to src/main.in.cc and rename to
have_controlling_terminal.
* options-usage.h (usage_string, octave_print_verbose_usage_and_exit):
Delete --no-fork from text.
(long_opts): Delete no-fork from list.
(NO_FORK_OPTION): Delete.
* run-octave.in: Set OCTAVE_BINDIR in environment before exec-ing
Octave binary.
* src/Makefile.am: Build octave-gui, octave-cli, and octave instead of
octave-cli and octave.
* main-gui.cc: Rename from main.cc. Call octave_start_gui and pass
START_GUI as parameter.
* main.in.cc: New file.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 27 Oct 2013 18:47:22 -0400 |
parents | d63878346099 |
children | 525af54479eb |
line wrap: on
line source
#! /bin/sh ## ## run-octave -- run Octave in the build tree. ## ## Copyright (C) 2006-2013 John W. Eaton ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the ## Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but WITHOUT ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. AWK=%AWK% FIND=%FIND% SED=%SED% # 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/scripts" d2="$builddir/scripts" d3="$builddir/libinterp" d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d1_path=`echo "$d1_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` d2_path=`echo "$d2_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` octave_executable="$builddir/src/octave" LOADPATH="$d1_path:$d2_path:$d3_path" IMAGEPATH="$top_srcdir/scripts/image" DOCFILE="$builddir/doc/interpreter/doc-cache" BUILT_IN_DOCSTRINGS_FILE="$builddir/libinterp/DOCSTRINGS" TEXIMACROSFILE="$top_srcdir/doc/interpreter/macros.texi" INFOFILE="$top_srcdir/doc/interpreter/octave.info" ## Checking for string equality below with prepended x's in order to ## handle problems with empty strings. if [ $# -gt 0 ]; then if [ "x$1" = "x-g" ]; then driver="gdb --args" shift elif [ "x$1" = "x-gud" ]; then ## Frontends for gdb (e.g. Emacs's GUD mode) need --annotate=3 driver="gdb --annotate=3 --args" shift elif [ "x$1" = "x-gud2" ]; then ## The latest version of gud needs -i=mi. There isn't a good way to check ## this at configure time, so we just add a gud2 flag driver="gdb -i=mi --args" shift elif [ "x$1" = "x-valgrind" ]; then driver="valgrind --tool=memcheck" shift elif [ "x$1" = "x-strace" ]; then driver="strace -o octave.trace" shift elif [ "x$1" = "x-cli" ]; then octave_executable="$builddir/src/octave-cli" shift fi fi OCTAVE_BINDIR="$builddir/src" \ OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings" \ OCTAVE_LOCALE_DIR="$builddir/libgui/languages" \ OCTAVE_JAVA_DIR="$builddir/scripts/java" \ exec $builddir/libtool --mode=execute $driver \ "$octave_executable" --no-init-path --path="$LOADPATH" \ --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \ --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@"