Mercurial > octave-nkf
view Makefile.am @ 19748:21015ca26566
Restructure shutdown flow and behavior for improved robustness
* file-editor-interface.h (file_editor_interface::check_closing): Remove
closing_state argument from input.
* file-editor-tab.cc (file_editor_tab::_cancelled): New static variable for
managing chain of file closes.
(file_editor_tab::file_editor_tab): Discard _app_closing and _modal_dialog
initializations.
(file_editor_tab::closeEvent): Upon accepting the close event, als request
tab removal.
(file_editor_tab::check_modified_file): New simple routine checking for
modified file if there hasn't been cancellation yet.
(file_editor_tab::run_file): Remove use of _modal_dialog.
(file_editor_tab::show_dialog): Add modal input setting. Remove use of
_app_closing and _modal_dialog.
(file_editor_tab::check_file_modified): Remove situational message for just
one. If modified, call show_dialog with modal true, return QMessageBox::Cancel
if anything cancelled, otherwise the user decision.
(file_editor_tab::handle_file_modified_answer): Do not remove file editor tab
in any case. If user cancelled, set _cancelled true.
(file_editor_tab::save_file): Add "false" (non-modal) to show_dialog() call.
(file_editor_tab::save_file_as): Add "false" (non-modal) to show_dialog() call.
(file_editor_tab::conditional_close): Remove input argument and use of variable
_app_closing.
* file-editor-tab.h (file_editor_tab::conditional_close): Remove input
argument.
(file_editor_tab::reset_cancel): New member function declaration for managing
cancellation of tab chain saves.
(file_editor_tab::was_cancel): New member function for indicating any
cancellation when saving modified files.
(file_editor_tab::check_modified_file): New slot declaration for checking and
saving file modifications.
(file_editor_tab::show_dialog): Add modal option input argument.
(file_editor_tab::_app_closing, file_editor_tab::_modal_dialog): Remove.
(file_editor_tab::_cancelled): Add.
* file-editor.cc (file_editor::file_editor): Remove _check_closing_done
initialization.
(file_editor::~file_editor): Remove use of _check_closing_done and
check_closing().
(file_editor::check_closing): Clear cancellation history and check all files
for modifications, without closing. Close all tabs and delete associated
widgets if no cancellation. Remove use of _check_closing_done.
(file_editor::request_close_file): Remove argument from conditional_close()
function call.
(file_editor::request_close_all_files): Ditto.
(file_editor::request_close_other_files): Ditto.
(file_editor::handle_tab_close_request): Ditto.
(file_editor::handle_tab_remove_request): Add comment about deleting sender.
(file_editor::add_file_editor_tab): Connect fetab_check_modified_file signal to
check_modified_file slot.
* file-editor.h (file_editor::fetab_check_modified_file): New signal.
(file_editor::check_closing): Remove input argument.
(file_editor::_check_closing_done): Remove.
* main-window.cc (main_window::confirm_shutdown_octave): Rename of member
function main_window::confirm_exit_octave(). Change return type to void. Set
octave/qt link confirmation result then awake worker process.
(main_window::exit_app): Rename of member function main_window::exit().
(main_window::closeEvent): Rather than post callback event, queue "exit" in
the command buffer.
(main_window::construct_octave_qt_link): Connect confirm_shutdown_signal to
confirm_shutdown_octave slot. Connect exit_app_signal to exit_app slot.
(main_window::exit_callback): Remove.
(main_window::confirm_exit_octave): Renamed as confirm_shutdown_octave().
* main-window.h (main_window::confirm_shutdown_octave): Rename of slot
confirm_exit_octave().
(main_window::exit): Renamed exit_app().
(main_window::exit_callback): Removed declaration.
(main_window::confirm_exit_octave): Renamed confirm_shutdown_octave().
* octave-qt-link.cc (octave_qt_link::do_confirm_shutdown): New virtual function
definition for initiating GUI shutdown and confirm exit. Worker process goes
into sleep mode after issuing cross-thread signal. Return confirmation result.
(octave_qt_link::do_exit): Change exit_signal to exit_app_signal.
octave-qt-link.h (octave_qt_link::do_confirm_shutdown): New virtual function
declaration for qt GUI.
(octave_qt_link::mutex): Added. A QMutex for communicating with Qt GUI.
(octave_qt_link::waitcondition): Added. For process wait.
(octave_qt_link::shutdown_confirmation): Added. Store confirmation result.
(octave_qt_link::_shutdown_confirm_result): Added. Confirmation result.
(octave_qt_link::exit_signal): Signal renamed exit_app_signal.
(octave_qt_link::confirm_shutdown_signal): Added.
(octave_qt_link::exit_app_signal): Renamed of exit_signal.
octave-link.h (octave_link::confirm_shutdown): Added. Access virtual function
do_confirm_shutdown.
(octave_link::do_confirm_shutdown): Added. Virtual function for GUI link.
toplev.cc (clean_up_and_exit): Change 'retval' to 'status', as header file uses
argument name 'status'.
(quit): First initiate GUI shutdown via octave_link::confirm_shutdown() and if
not confirmed, immediately return thereby avoiding exit sequence.
author | Daniel J Sebald <daniel.sebald@ieee.org> |
---|---|
date | Sat, 14 Feb 2015 11:27:10 -0600 |
parents | 4197fc428c7d |
children | 4f6ae6b94abe |
line wrap: on
line source
# Makefile for Octave # # Copyright (C) 1993-2015 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/>. include build-aux/common.mk ## Avoid making multiple subdirs in parallel which can lead ## to a confusing error message stream .NOTPARALLEL: ACLOCAL_AMFLAGS = -I m4 BUILT_DISTFILES = AUTHORS BUGS ChangeLog INSTALL.OCTAVE EXTRA_DIST = \ AUTHORS \ BUGS \ COPYING \ ChangeLog \ INSTALL \ INSTALL.OCTAVE \ NEWS \ README \ CITATION \ build-aux/find-files-with-tests.sh \ build-aux/mk-opts.pl \ build-aux/move-if-change \ build-aux/OctJavaQry.class \ build-aux/stl_algo.h-fixed \ etc/NEWS.1 \ etc/NEWS.2 \ etc/NEWS.3 \ etc/OLD-ChangeLogs/ChangeLog \ etc/OLD-ChangeLogs/ChangeLog.1 \ etc/OLD-ChangeLogs/doc-ChangeLog \ etc/OLD-ChangeLogs/libcruft-ChangeLog \ etc/OLD-ChangeLogs/liboctave-ChangeLog \ etc/OLD-ChangeLogs/scripts-ChangeLog \ etc/OLD-ChangeLogs/src-ChangeLog \ etc/OLD-ChangeLogs/test-ChangeLog \ etc/PROJECTS \ etc/README.Cygwin \ etc/README.Linux \ etc/README.MacOS \ etc/README.MinGW \ etc/README.Windows \ etc/README.gnuplot \ etc/README.kpathsea \ etc/gdbinit \ etc/octave.appdata.xml \ run-octave.in include m4/module.mk # Subdirectories in which to run `make all'. Including "." before # @DOCDIR@ is an attempt to force all preceding directories in the list # to be processed before the current directory so that the # scripts/DOCSTRINGS libinterp/DOCSTRINGS files are built before # attempting to build AUTHORS and BUGS. Including "." again at the end # of the list ensures that we display the "Octave sucessfully built..." # message at the very end of the output from Make. Another fix for # these problems would be to continue eliminating the recursive make # invocations so that we have better control over the dependencies and # the order that things are built. SUBDIRS = libgnu liboctave libinterp if AMCOND_BUILD_GUI SUBDIRS += libgui endif SUBDIRS += src scripts . @DOCDIR@ examples etc/icons test . if ! AMCOND_BUILD_DOCS dist-hook: echo "Documentation disabled. Cannot package distribution!" ; exit 1; endif BUILT_SOURCES = run-octave if AMCOND_HAVE_BROKEN_STL_ALGO_H BUILT_SOURCES += bits/stl_algo.h else BUILT_SOURCES += nonexistent-file endif noinst_SCRIPTS = run-octave INFO_FILES = \ AUTHORS \ BUGS \ INSTALL.OCTAVE CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = \ .gdbinit \ ChangeLog MAINTAINERCLEANFILES = $(BUILT_DISTFILES) CONFIG_FILES = @ac_config_headers@ @ac_config_files@ nodist_octinclude_HEADERS = config.h octinclude_HEADERS = oct-conf-post.h all-local: $(noinst_SCRIPTS) $(INFO_FILES) .gdbinit @echo "" @echo "Octave successfully built. Now choose from the following:" @echo "" @echo " ./run-octave - to run in place to test before installing" @echo " make check - to run the tests" @echo " make install - to install (PREFIX=$(prefix))" @echo "" check: all $(MAKE) -C test check if AMCOND_HAVE_LLVM check-jit: all $(MAKE) -C test check-jit endif run-octave: run-octave.in Makefile @$(do_subst_script_vals) chmod a+rx "$@" bits/stl_algo.h: build-aux/stl_algo.h-fixed $(MKDIR_P) bits $(INSTALL_HEADER) $< $@ ## If we aren't trying to fix stl_algo.h, then try to ensure that ## there isn't a stray copy sitting in the build tree. nonexistent-file: rm -f bits/stl_algo.h .PHONY: nonexistent-file .gdbinit: etc/gdbinit @$(gdbinit_install_rule) if AMCOND_BUILD_DOCS AUTHORS BUGS INSTALL.OCTAVE: $(MAKE) -C doc/interpreter ../../$@ endif .PHONY: AUTHORS BUGS INSTALL.OCTAVE ChangeLog: (cd $(srcdir); hg log --style=build-aux/changelog.tmpl --prune=b0e60ad4ae26 --only-branch=`hg branch`; echo ""; echo "See the files in the directory etc/OLD-ChangeLogs for changes before 2011-04-19") > $@.t mv $@.t $@ .PHONY: ChangeLog octetc_DATA = \ CITATION \ NEWS \ config.log doxyhtml: $(MAKE) -C doc/doxyhtml doxyhtml .PHONY: doxyhtml DIRS_TO_MAKE = \ $(localfcnfiledir) \ $(localapifcnfiledir) \ $(localverfcnfiledir) \ $(localoctfiledir) \ $(localapioctfiledir) \ $(localveroctfiledir) \ $(localarchlibdir) \ $(localapiarchlibdir) \ $(localverarchlibdir) installdirs-local: $(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) install-data-local: installdirs-local