// Commented out because package().locale_dir() can be called
// from the message translation code in Messages.cpp before
// init_package() is called. Lars is on the case...
- // BOOST_ASSERT(initialised_);
+ // LASSERT(initialised_, /**/);
return package_;
}
FileName const get_system_support_dir(FileName const & abs_binary,
string const & command_line_system_support_dir);
-FileName const get_temp_dir();
-
FileName const get_default_user_support_dir(FileName const & home_dir);
bool userSupportDir(FileName const & default_user_support_dir,
: explicit_user_support_dir_(false)
{
home_dir_ = get_home_dir();
- system_temp_dir_ = get_temp_dir();
+ // Specification of temp_dir_ may be reset by LyXRC,
+ // but the default is fixed for a given OS.
+ system_temp_dir_ = FileName::tempPath();
temp_dir_ = system_temp_dir_;
document_dir_ = get_document_dir(home_dir_);
}
+void Package::set_temp_dir(FileName const & temp_dir) const
+{
+ if (temp_dir.empty())
+ temp_dir_ = system_temp_dir_;
+ else
+ temp_dir_ = temp_dir;
+}
+
+
namespace {
// These next functions contain the stuff that is substituted at
}
-// Specification of temp_dir_ may be reset by LyXRC,
-// but the default is fixed for a given OS.
-FileName const get_temp_dir()
-{
-#if defined (USE_WINDOWS_PACKAGING)
- // Typical example: C:/TEMP/.
- char path[MAX_PATH];
- GetTempPath(MAX_PATH, path);
- return FileName(to_utf8(from_local8bit(path)));
-#else // Posix-like.
- return FileName("/tmp");
-#endif
-}
-
-
// Extracts the absolute path from the foo of "-sysdir foo" or "-userdir foo"
FileName const abs_path_from_command_line(string const & command_line)
{
if (command_line.empty())
return FileName();
- string const path = fix_dir_name(command_line);
- return os::is_absolute_path(path) ? FileName(path) : makeAbsPath(path);
+ string const str_path = fix_dir_name(command_line);
+ FileName path(str_path);
+ return path.isAbsolute() ? path : makeAbsPath(str_path);
}
#else
string const exe_path = os::internal_path(exe);
#endif
- if (os::is_absolute_path(exe_path))
- return FileName(exe_path);
+ FileName exepath(exe_path);
+ if (exepath.isAbsolute())
+ return exepath;
// Two possibilities present themselves.
// 1. The binary is relative to the CWD.
if (exe_name != exe_path)
return FileName();
- std::vector<string> const path = getEnvPath("PATH");
- std::vector<string>::const_iterator it = path.begin();
- std::vector<string>::const_iterator const end = path.end();
+ vector<string> const path = getEnvPath("PATH");
+ vector<string>::const_iterator it = path.begin();
+ vector<string>::const_iterator const end = path.end();
for (; it != end; ++it) {
// This will do nothing if *it is already absolute.
string const exe_dir = makeAbsPath(*it).absFilename();
// searched_dirs is used for diagnostic purposes only in the case
// that "chkconfig.ltx" is not found.
- std::list<FileName> searched_dirs;
+ list<FileName> searched_dirs;
// 1. Use the -sysdir command line parameter.
FileName path = abs_path_from_command_line(command_line_system_support_dir);
return path;
}
- // 2. Use the "LYX_DIR_15x" environment variable.
- path = extract_env_var_dir("LYX_DIR_15x");
+ // 2. Use the "LYX_DIR_${major}${minor}x" environment variable.
+ path = extract_env_var_dir(LYX_DIR_VER);
if (!path.empty()) {
searched_dirs.push_back(path);
- if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_15x"))
+ if (check_env_var_dir(path, chkconfig_ltx, LYX_DIR_VER))
return path;
}
// Everything has failed :-(
// So inform the user and exit.
string searched_dirs_str;
- typedef std::list<FileName>::const_iterator iterator;
+ typedef list<FileName>::const_iterator iterator;
iterator const begin = searched_dirs.begin();
iterator const end = searched_dirs.end();
for (iterator it = begin; it != end; ++it) {
// FIXME UNICODE
throw ExceptionMessage(ErrorException, _("No system directory"),
bformat(_("Unable to determine the system directory "
- "having searched\n"
- "\t%1$s\n"
- "Use the '-sysdir' command line parameter or "
- "set the environment variable LYX_DIR_15x to "
- "the LyX system directory containing the file "
- "`chkconfig.ltx'."),
- from_utf8(searched_dirs_str)));
+ "having searched\n"
+ "\t%1$s\n"
+ "Use the '-sysdir' command line parameter or "
+ "set the environment variable\n%2$s "
+ "to the LyX system directory containing the "
+ "file `chkconfig.ltx'."),
+ from_utf8(searched_dirs_str), from_ascii(LYX_DIR_VER)));
// Keep the compiler happy.
return FileName();
if (!result.empty())
return true;
- // 2. Use the LYX_USERDIR_15x environment variable.
- result = extract_env_var_dir("LYX_USERDIR_15x");
+ // 2. Use the LYX_USERDIR_${major}${minor}x environment variable.
+ result = extract_env_var_dir(LYX_USERDIR_VER);
if (!result.empty())
return true;
// Check that directory @c dir contains @c file.
-// Else emit a warning about an invalid @c command_line_switch.
+// Else emit an error message about an invalid @c command_line_switch.
bool check_command_line_dir(string const & dir,
string const & file,
string const & command_line_switch)
FileName const abs_path = fileSearch(dir, file);
if (abs_path.empty()) {
// FIXME UNICODE
- throw ExceptionMessage(WarningException, _("File not found"), bformat(
+ throw ExceptionMessage(ErrorException, _("File not found"), bformat(
_("Invalid %1$s switch.\nDirectory %2$s does not contain %3$s."),
from_utf8(command_line_switch), from_utf8(dir),
from_utf8(file)));