anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some forgotten FileName conversions to enable installation in non-ascii

Browse Source 
paths


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16308 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-12-17 09:46:04 +00:00
parent 12534e6794
commit 01c3046d5a
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/support/package.C.in
View File

@ -279,7 +279,7 @@ get_build_dirs(string const & abs_binary,
// Check whether binary is a symbolic link. // Check whether binary is a symbolic link.
// If so, resolve it and repeat the exercise. // If so, resolve it and repeat the exercise.
if (!fs::symbolic_link_exists(binary)) if (!fs::symbolic_link_exists(FileName(binary).toFilesystemEncoding()))
break; break;
string link; string link;
@ -330,22 +330,24 @@ string const get_home_dir()
string const get_locale_dir(string const & system_support_dir) string const get_locale_dir(string const & system_support_dir)
{ {
// 1. Use the "LYX_LOCALEDIR" environment variable. // 1. Use the "LYX_LOCALEDIR" environment variable.
string path = extract_env_var_dir("LYX_LOCALEDIR"); string const path_env = extract_env_var_dir("LYX_LOCALEDIR");
if (!path.empty() && check_env_var_dir(path, "LYX_LOCALEDIR")) if (!path_env.empty() && check_env_var_dir(path_env, "LYX_LOCALEDIR"))
return path; return path_env;
// 2. Search for system_support_dir / <relative locale dir> // 2. Search for system_support_dir / <relative locale dir>
// The <relative locale dir> is OS-dependent. (On Unix, it will // The <relative locale dir> is OS-dependent. (On Unix, it will
// be "../locale/".) // be "../locale/".)
path = normalizePath(addPath(system_support_dir, relative_locale_dir())); FileName path(normalizePath(addPath(system_support_dir, relative_locale_dir())));
if (fs::exists(path) && fs::is_directory(path)) if (fs::exists(path.toFilesystemEncoding()) &&
return path; fs::is_directory(path.toFilesystemEncoding()))
return path.absFilename();
// 3. Fall back to the hard-coded LOCALEDIR. // 3. Fall back to the hard-coded LOCALEDIR.
path = hardcoded_localedir(); path = FileName(hardcoded_localedir());
if (fs::exists(path) && fs::is_directory(path)) if (fs::exists(path.toFilesystemEncoding()) &&
return path; fs::is_directory(path.toFilesystemEncoding()))
return path.absFilename();
return string(); return string();
} }
@ -405,7 +407,7 @@ string const get_binary_path(string const & exe)
// Two possibilities present themselves. // Two possibilities present themselves.
// 1. The binary is relative to the CWD. // 1. The binary is relative to the CWD.
string const abs_exe_path = makeAbsPath(exe_path); string const abs_exe_path = makeAbsPath(exe_path);
if (fs::exists(abs_exe_path)) if (fs::exists(FileName(abs_exe_path).toFilesystemEncoding()))
return abs_exe_path; return abs_exe_path;
// 2. exe must be the name of the binary only and it // 2. exe must be the name of the binary only and it
@ -422,7 +424,7 @@ string const get_binary_path(string const & exe)
string const exe_dir = makeAbsPath(*it); string const exe_dir = makeAbsPath(*it);
string const exe_path = addName(exe_dir, exe_name); string const exe_path = addName(exe_dir, exe_name);
if (fs::exists(exe_path)) if (fs::exists(FileName(exe_path).toFilesystemEncoding()))
return exe_path; return exe_path;
} }
@ -501,7 +503,7 @@ get_system_support_dir(string const & abs_binary,
// Check whether binary is a symbolic link. // Check whether binary is a symbolic link.
// If so, resolve it and repeat the exercise. // If so, resolve it and repeat the exercise.
if (!fs::symbolic_link_exists(binary)) if (!fs::symbolic_link_exists(FileName(binary).toFilesystemEncoding()))
break; break;
string link; string link;
@ -519,7 +521,7 @@ get_system_support_dir(string const & abs_binary,
// This time test whether the directory is a symbolic link // This time test whether the directory is a symbolic link
// *before* looking for "chkconfig.ltx". // *before* looking for "chkconfig.ltx".
// (We've looked relative to the original already.) // (We've looked relative to the original already.)
if (!fs::symbolic_link_exists(binary)) if (!fs::symbolic_link_exists(FileName(binary).toFilesystemEncoding()))
break; break;
string link; string link;
@ -688,7 +690,8 @@ bool check_env_var_dir(string const & dir,
bool check_env_var_dir(string const & dir, bool check_env_var_dir(string const & dir,
string const & env_var) string const & env_var)
{ {
bool const success = (fs::exists(dir) && fs::is_directory(dir)); string const encoded(FileName(dir).toFilesystemEncoding());
bool const success = (fs::exists(encoded) && fs::is_directory(encoded));
if (!success) { if (!success) {
// Put this string on a single line so that the gettext // Put this string on a single line so that the gettext