#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/os.h"
+#include "support/PathChanger.h"
+#include "support/Systemcall.h"
#if defined (USE_WINDOWS_PACKAGING)
# include "support/os_win32.h"
#endif
+#include <iostream>
#include <list>
#if !defined (USE_WINDOWS_PACKAGING) && \
Package const & package()
{
- LASSERT(initialised_, /**/);
+ LAPPERR(initialised_);
return package_;
}
lyx_dir_ = FileName(lyx_dir_.realPath());
// Is LyX being run in-place from the build tree?
- bool in_build_dir = inBuildDir(abs_binary, build_support_dir_, system_support_dir_);
+ in_build_dir_ = inBuildDir(abs_binary, build_support_dir_, system_support_dir_);
- if (!in_build_dir) {
+ if (!in_build_dir_) {
system_support_dir_ =
get_system_support_dir(abs_binary,
command_line_system_support_dir);
- }
+ }
// Find the LyX executable
lyx_binary_ = findLyxBinary(abs_binary);
explicit_user_support_dir_ = userSupportDir(default_user_support_dir,
command_line_user_support_dir, user_support_dir_);
- FileName const configure_script(addName(system_support().absFileName(), "configure.py"));
- configure_command_ = os::python() + ' ' +
- quoteName(configure_script.toFilesystemEncoding(), quote_python) +
- with_version_suffix();
LYXERR(Debug::INIT, "<package>\n"
<< "\tbinary_dir " << binary_dir().absFileName() << '\n'
}
+int Package::reconfigureUserLyXDir(string const & option) const
+{
+ if (configure_command_.empty()) {
+ FileName const configure_script(addName(system_support().absFileName(), "configure.py"));
+ configure_command_ = os::python() + ' ' +
+ quoteName(configure_script.toFilesystemEncoding()) +
+ with_version_suffix() + " --binary-dir=" +
+ quoteName(FileName(binary_dir().absFileName()).toFilesystemEncoding());
+ }
+
+ lyxerr << to_utf8(_("LyX: reconfiguring user directory")) << endl;
+ PathChanger p(user_support());
+ Systemcall one;
+ int const ret = one.startscript(Systemcall::Wait, configure_command_ + option);
+ lyxerr << "LyX: " << to_utf8(_("Done!")) << endl;
+ return ret;
+}
+
+
+string Package::getConfigureLockName() const
+{
+ return user_support().absFileName() + ".lyx_configure_lock";
+}
+
+
void Package::set_temp_dir(FileName const & temp_dir) const
{
if (temp_dir.empty())
temp_dir_ = temp_dir;
}
+
+FileName Package::messages_file(string const & c) const
+{
+ if (in_build_dir_) {
+ FileName res = FileName(lyx_dir().absFileName() + "/../po/" + c + ".gmo");
+ if (!res.isReadableFile())
+ res = FileName(top_srcdir().absFileName() + "/po/" + c + ".gmo");
+ return res;
+ } else
+ return FileName(locale_dir_.absFileName() + "/" + c
+ + "/LC_MESSAGES/" PACKAGE ".mo");
+}
+
+
// The specification of home_dir_ is fixed for a given OS.
// A typical example on Windows: "C:/Documents and Settings/USERNAME"
// and on a Posix-like machine: "/home/USERNAME".