#include "frontends/lyx_gui.h"
#include "frontends/LyXView.h"
-#include "support/FileInfo.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include "support/os.h"
+#include "support/package.h"
#include "support/path.h"
-#include "support/path_defines.h"
#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
#include <iostream>
#include <csignal>
using lyx::support::bformat;
using lyx::support::createDirectory;
using lyx::support::createLyXTmpDir;
-using lyx::support::FileInfo;
using lyx::support::FileSearch;
using lyx::support::GetEnv;
-using lyx::support::GetEnvPath;
using lyx::support::i18nLibFileSearch;
using lyx::support::LibFileSearch;
+using lyx::support::package;
using lyx::support::Path;
+using lyx::support::prependEnvPath;
+using lyx::support::QuoteName;
using lyx::support::rtrim;
-using lyx::support::setLyxPaths;
-using lyx::support::system_lyxdir;
-using lyx::support::user_lyxdir;
-
-using lyx::support::os::getTmpDir;
-using lyx::support::os::setTmpDir;
namespace os = lyx::support::os;
+namespace fs = boost::filesystem;
using std::endl;
using std::string;
namespace {
+// Filled with the command line arguments "foo" of "-sysdir foo" or
+// "-userdir foo".
+string cl_system_support;
+string cl_user_support;
+
+
void showFileError(string const & error)
{
Alert::warning(_("Could not read configuration file"),
exit(EXIT_FAILURE);
}
+
+void reconfigureUserLyXDir()
+{
+ string const configure_script =
+ AddName(package().system_support(), "configure");
+ string const configure_command =
+ "sh " + QuoteName(configure_script);
+
+ lyxerr << _("LyX: reconfiguring user directory") << endl;
+ Path p(package().user_support());
+ ::system(configure_command.c_str());
+ lyxerr << "LyX: " << _("Done!") << endl;
+}
+
} // namespace anon
// we need to parse for "-dbg" and "-help"
bool const want_gui = easyParse(argc, argv);
+ lyx::support::init_package(argv[0], cl_system_support, cl_user_support);
+
if (want_gui)
lyx_gui::parse_init(argc, argv);
}
+/*
+Signals and Windows
+===================
+The SIGHUP signal does not exist on Windows and does not need to be handled.
+
+Windows handles SIGFPE and SIGSEGV signals as expected.
+
+Cntl+C interrupts (mapped to SIGINT by Windows' POSIX compatability layer)
+cause a new thread to be spawned. This may well result in unexpected
+behaviour by the single-threaded LyX.
+
+SIGTERM signals will come only from another process actually sending
+that signal using 'raise' in Windows' POSIX compatability layer. It will
+not come from the general "terminate process" methods that everyone
+actually uses (and which can't be trapped). Killing an app 'politely' on
+Windows involves first sending a WM_CLOSE message, something that is
+caught already by the Qt frontend.
+
+For more information see:
+
+http://aspn.activestate.com/ASPN/Mail/Message/ActiveTcl/2034055
+...signals are mostly useless on Windows for a variety of reasons that are
+Windows specific...
+
+'UNIX Application Migration Guide, Chapter 9'
+http://msdn.microsoft.com/library/en-us/dnucmg/html/UCMGch09.asp
+
+'How To Terminate an Application "Cleanly" in Win32'
+http://support.microsoft.com/default.aspx?scid=kb;en-us;178893
+*/
extern "C" {
static void error_handler(int err_sig)
// This shouldn't matter here, however, as we've already invoked
// emergencyCleanup.
switch (err_sig) {
+#ifdef SIGHUP
case SIGHUP:
lyxerr << "\nlyx: SIGHUP signal caught\nBye." << endl;
break;
+#endif
case SIGFPE:
lyxerr << "\nlyx: SIGFPE signal caught\nBye." << endl;
break;
}
// Deinstall the signal handlers
+#ifdef SIGHUP
signal(SIGHUP, SIG_DFL);
+#endif
signal(SIGINT, SIG_DFL);
signal(SIGFPE, SIG_DFL);
signal(SIGSEGV, SIG_DFL);
signal(SIGTERM, SIG_DFL);
+#ifdef SIGHUP
if (err_sig == SIGSEGV ||
(err_sig != SIGHUP && !GetEnv("LYXDEBUG").empty()))
+#else
+ if (err_sig == SIGSEGV || !GetEnv("LYXDEBUG").empty())
+#endif
lyx::support::abort();
exit(0);
}
void LyX::init(bool gui)
{
+#ifdef SIGHUP
signal(SIGHUP, error_handler);
+#endif
signal(SIGFPE, error_handler);
signal(SIGSEGV, error_handler);
signal(SIGINT, error_handler);
signal(SIGTERM, error_handler);
// SIGPIPE can be safely ignored.
- bool const explicit_userdir = setLyxPaths();
+#if !defined (USE_POSIX_PACKAGING)
+ // Add the directory containing the LyX executable to the path
+ // so that LyX can find things like reLyX.
+ if (package().build_support().empty())
+ prependEnvPath("PATH", package().binary_dir());
+#endif
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
+ bool reconfigure = false;
if (gui) {
- queryUserLyXDir(explicit_userdir);
+ reconfigure =
+ queryUserLyXDir(package().explicit_user_support());
} else {
first_start = false;
}
// Disable gui when easyparse says so
lyx_gui::use_gui = gui;
+ lyxrc.tempdir_path = package().temp_dir();
+ lyxrc.document_path = package().document_dir();
+
if (lyxrc.template_path.empty()) {
- lyxrc.template_path = AddPath(system_lyxdir(), "templates");
+ lyxrc.template_path = AddPath(package().system_support(),
+ "templates");
}
if (lyxrc.lastfiles.empty()) {
- lyxrc.lastfiles = AddName(user_lyxdir(), "lastfiles");
+ lyxrc.lastfiles = AddName(package().user_support(), "lastfiles");
}
if (lyxrc.roman_font_name.empty())
if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- setTmpDir(createLyXTmpDir(lyxrc.tempdir_path));
- if (getTmpDir().empty()) {
+ os::cygwin_path_fix(lyxrc.cygwin_path_fix);
+ prependEnvPath("PATH", lyxrc.path_prefix);
+
+ // Having reset the PATH we're now in a position to run configure
+ // if necessary.
+ if (reconfigure)
+ reconfigureUserLyXDir();
+
+ if (fs::is_directory(lyxrc.document_path))
+ package().document_dir() = lyxrc.document_path;
+
+ package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path);
+ if (package().temp_dir().empty()) {
Alert::error(_("Could not create temporary directory"),
bformat(_("Could not create a temporary directory in\n"
"%1$s. Make sure that this\n"
}
if (lyxerr.debugging(Debug::INIT)) {
- lyxerr << "LyX tmp dir: `" << getTmpDir() << '\'' << endl;
+ lyxerr << "LyX tmp dir: `" << package().temp_dir() << '\'' << endl;
}
lyxerr[Debug::INIT] << "Reading lastfiles `"
}
-void LyX::queryUserLyXDir(bool explicit_userdir)
+bool LyX::queryUserLyXDir(bool explicit_userdir)
{
- string const configure_script = AddName(system_lyxdir(), "configure");
+ bool reconfigure = false;
// Does user directory exist?
- FileInfo fileInfo(user_lyxdir());
- if (fileInfo.isOK() && fileInfo.isDir()) {
+ if (fs::is_directory(package().user_support())) {
first_start = false;
- FileInfo script(configure_script);
- FileInfo defaults(AddName(user_lyxdir(), "lyxrc.defaults"));
- if (defaults.isOK() && script.isOK()
- && defaults.getModificationTime() < script.getModificationTime()) {
- lyxerr << _("LyX: reconfiguring user directory")
- << endl;
- Path p(user_lyxdir());
- ::system(configure_script.c_str());
- lyxerr << "LyX: " << _("Done!") << endl;
+ string const configure_script =
+ AddName(package().system_support(), "configure");
+ string const userDefaults =
+ AddName(package().user_support(), "lyxrc.defaults");
+ if (fs::exists(configure_script) &&
+ fs::exists(userDefaults) &&
+ fs::last_write_time(configure_script)
+ < fs::last_write_time(userDefaults)) {
+ reconfigure = true;
}
- return;
+ return reconfigure;
}
first_start = !explicit_userdir;
- lyxerr << bformat(_("LyX: Creating directory %1$s"
- " and running configure..."), user_lyxdir()) << endl;
+ // If the user specified explicitly a directory, ask whether
+ // to create it. If the user says "no", then exit.
+ if (explicit_userdir &&
+ !Alert::prompt(
+ _("Missing LyX support directory"),
+ bformat(_("You have specified a non-existent user "
+ "LyX directory, %1$s.\n"
+ "It is needed to keep your own configuration."),
+ package().user_support()),
+ 1, 0,
+ _("&Create directory."),
+ _("&Exit LyX."))) {
+ lyxerr << _("No user LyX directory. Exiting.") << endl;
+ exit(1);
+ }
- if (!createDirectory(user_lyxdir(), 0755)) {
- // Failed, let's use $HOME instead.
- user_lyxdir(os::homepath());
- lyxerr << bformat(_("Failed. Will use %1$s instead."),
- user_lyxdir()) << endl;
- return;
+ lyxerr << bformat(_("LyX: Creating directory %1$s"),
+ package().user_support())
+ << endl;
+ reconfigure = true;
+
+ if (!createDirectory(package().user_support(), 0755)) {
+ // Failed, so let's exit.
+ lyxerr << _("Failed to create directory. Exiting.")
+ << endl;
+ exit(1);
}
- // Run configure in user lyx directory
- Path p(user_lyxdir());
- ::system(configure_script.c_str());
- lyxerr << "LyX: " << _("Done!") << endl;
+ return reconfigure;
}
lyxerr << _("Missing directory for -sysdir switch") << endl;
exit(1);
}
- system_lyxdir(arg);
+ cl_system_support = arg;
return 1;
}
lyxerr << _("Missing directory for -userdir switch") << endl;
exit(1);
}
- user_lyxdir(arg);
+ cl_user_support = arg;
return 1;
}
projects / lyx.git / blobdiff