document_dir_ = get_document_dir(home_dir_);
FileName const abs_binary = abs_path_from_binary_name(command_line_arg0);
- string const bdir = onlyPath(abs_binary.absFilename());
- // We may be using libtools
- if (suffixIs(bdir, ".libs/"))
- binary_dir_ = FileName(addPath(bdir, "../"));
- else
- binary_dir_ = FileName(bdir);
+ binary_dir_ = FileName(onlyPath(abs_binary.absFileName()));
// Is LyX being run in-place from the build tree?
buildDirs(abs_binary, top_build_dir_location,
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"));
+ FileName const configure_script(addName(system_support().absFileName(), "configure.py"));
configure_command_ = os::python() + ' ' +
- quoteName(configure_script.toFilesystemEncoding()) +
+ quoteName(configure_script.toFilesystemEncoding(), quote_python) +
with_version_suffix();
LYXERR(Debug::INIT, "<package>\n"
- << "\tbinary_dir " << binary_dir().absFilename() << '\n'
- << "\tsystem_support " << system_support().absFilename() << '\n'
- << "\tbuild_support " << build_support().absFilename() << '\n'
- << "\tuser_support " << user_support().absFilename() << '\n'
- << "\tlocale_dir " << locale_dir().absFilename() << '\n'
- << "\tdocument_dir " << document_dir().absFilename() << '\n'
- << "\ttemp_dir " << temp_dir().absFilename() << '\n'
- << "\thome_dir " << home_dir().absFilename() << '\n'
+ << "\tbinary_dir " << binary_dir().absFileName() << '\n'
+ << "\tsystem_support " << system_support().absFileName() << '\n'
+ << "\tbuild_support " << build_support().absFileName() << '\n'
+ << "\tuser_support " << user_support().absFileName() << '\n'
+ << "\tlocale_dir " << locale_dir().absFileName() << '\n'
+ << "\tdocument_dir " << document_dir().absFileName() << '\n'
+ << "\ttemp_dir " << temp_dir().absFileName() << '\n'
+ << "\thome_dir " << home_dir().absFileName() << '\n'
<< "</package>\n");
}
FileName binary = abs_binary;
while (true) {
// Try and find "lyxrc.defaults".
- string binary_dir = onlyPath(binary.absFilename());
- // We may be using libtools with static linking.
- if (suffixIs(binary_dir, ".libs/"))
- binary_dir = addPath(binary_dir, "../");
+ string binary_dir = onlyPath(binary.absFileName());
build_support_dir = buildSupportDir(binary_dir, top_build_dir_location);
- if (!fileSearch(build_support_dir.absFilename(), "Makefile").empty()) {
+ if (!fileSearch(build_support_dir.absFileName(), "Makefile").empty()) {
// Try and find "chkconfig.ltx".
system_support_dir =
- FileName(addPath(Package::top_srcdir().absFilename(), "lib"));
+ FileName(addPath(Package::top_srcdir().absFileName(), "lib"));
- if (!fileSearch(system_support_dir.absFilename(), "chkconfig.ltx").empty()) {
+ if (!fileSearch(system_support_dir.absFileName(), "chkconfig.ltx").empty()) {
LYXERR(Debug::INIT, check_text << " yes");
return;
}
// 2. Search for system_support_dir / <relative locale dir>
// The <relative locale dir> is OS-dependent. (On Unix, it will
// be "../locale/".)
- FileName path(addPath(system_support_dir.absFilename(),
+ FileName path(addPath(system_support_dir.absFileName(),
relative_locale_dir()));
if (path.exists() && path.isDirectory())
return FileName();
string const str_path = fix_dir_name(command_line);
- FileName path(str_path);
- return path.isAbsolute() ? path : makeAbsPath(str_path);
+ return makeAbsPath(str_path);
}
#else
string const exe_path = os::internal_path(exe);
#endif
- FileName exepath(exe_path);
- if (exepath.isAbsolute())
- return exepath;
+ if (FileName::isAbsolute(exe_path))
+ return FileName(exe_path);
// Two possibilities present themselves.
// 1. The binary is relative to the CWD.
// 2. exe must be the name of the binary only and it
// can be found on the PATH.
- string const exe_name = onlyFilename(exe_path);
+ string const exe_name = onlyFileName(exe_path);
if (exe_name != exe_path)
return FileName();
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();
+ string const exe_dir = makeAbsPath(*it).absFileName();
FileName const exe_path(addName(exe_dir, exe_name));
if (exe_path.exists())
FileName path = abs_path_from_command_line(command_line_system_support_dir);
if (!path.empty()) {
searched_dirs.push_back(path);
- if (check_command_line_dir(path.absFilename(), chkconfig_ltx, "-sysdir"))
+ if (check_command_line_dir(path.absFileName(), chkconfig_ltx, "-sysdir"))
return path;
}
- // 2. Use the "LYX_DIR_16x" environment variable.
- // FIXME We need to iherit the actual version number from elsewhere
- // otherwise we will forget to update this for new major releases
- path = extract_env_var_dir("LYX_DIR_16x");
+ // 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_16x"))
+ if (check_env_var_dir(path, chkconfig_ltx, LYX_DIR_VER))
return path;
}
FileName binary = abs_binary;
while (true) {
// Try and find "chkconfig.ltx".
- string const binary_dir = onlyPath(binary.absFilename());
+ string const binary_dir = onlyPath(binary.absFileName());
FileName const lyxdir(addPath(binary_dir, relative_lyxdir));
searched_dirs.push_back(lyxdir);
- if (!fileSearch(lyxdir.absFilename(), chkconfig_ltx).empty()) {
+ if (!fileSearch(lyxdir.absFileName(), chkconfig_ltx).empty()) {
// Success! "chkconfig.ltx" has been found.
return lyxdir;
}
}
// 4. Repeat the exercise on the directory itself.
- FileName binary_dir(onlyPath(abs_binary.absFilename()));
+ FileName binary_dir(onlyPath(abs_binary.absFileName()));
while (true) {
// This time test whether the directory is a symbolic link
// *before* looking for "chkconfig.ltx".
}
// Try and find "chkconfig.ltx".
- FileName const lyxdir(addPath(binary_dir.absFilename(),
+ FileName const lyxdir(addPath(binary_dir.absFileName(),
relative_lyxdir));
searched_dirs.push_back(lyxdir);
- if (!fileSearch(lyxdir.absFilename(), chkconfig_ltx).empty()) {
+ if (!fileSearch(lyxdir.absFileName(), chkconfig_ltx).empty()) {
// Success! "chkconfig.ltx" has been found.
return lyxdir;
}
// 5. In desparation, try the hard-coded system support dir.
path = hardcoded_system_support_dir();
- if (!fileSearch(path.absFilename(), chkconfig_ltx).empty())
+ if (!fileSearch(path.absFileName(), chkconfig_ltx).empty())
return path;
// Everything has failed :-(
for (iterator it = begin; it != end; ++it) {
if (it != begin)
searched_dirs_str += "\n\t";
- searched_dirs_str += it->absFilename();
+ searched_dirs_str += it->absFileName();
}
// 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_16x 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_16x environment variable.
- result = extract_env_var_dir("LYX_USERDIR_16x");
+ // 2. Use the LYX_USERDIR_${major}${minor}x environment variable.
+ result = extract_env_var_dir(LYX_USERDIR_VER);
if (!result.empty())
return true;
return FileName(addPath(reinterpret_cast<char const *>(store), PACKAGE));
#else // USE_POSIX_PACKAGING
- return FileName(addPath(home_dir.absFilename(), string(".") + PACKAGE));
+ return FileName(addPath(home_dir.absFileName(), string(".") + PACKAGE));
#endif
}
string const & file,
string const & env_var)
{
- FileName const abs_path = fileSearch(dir.absFilename(), file);
+ FileName const abs_path = fileSearch(dir.absFileName(), file);
if (abs_path.empty()) {
// FIXME UNICODE
throw ExceptionMessage(WarningException, _("File not found"), bformat(
_("Invalid %1$s environment variable.\n"
"Directory %2$s does not contain %3$s."),
- from_utf8(env_var), from_utf8(dir.absFilename()),
+ from_utf8(env_var), from_utf8(dir.absFileName()),
from_utf8(file)));
}
_("Invalid %1$s environment variable.\n%2$s is not a directory.");
throw ExceptionMessage(WarningException, _("Directory not found"), bformat(
- fmt, from_utf8(env_var), from_utf8(dir.absFilename())));
+ fmt, from_utf8(env_var), from_utf8(dir.absFileName())));
}
return success;
projects / lyx.git / blobdiff