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

upgrade to latest package.C.in

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14961 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-09-10 10:28:41 +00:00
parent a91f077dbd
commit 35515415a3
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
development/cmake/src/support/package.C.cmake
View File

@ -148,8 +148,8 @@ Package::Package(string const & command_line_arg0,
command_line_user_support_dir); command_line_user_support_dir);
string const configure_script = addName(system_support(), "configure.py"); string const configure_script = addName(system_support(), "configure.py");
configure_command_ = "python " + quoteName(configure_script) configure_command_ = os::python() + ' ' + quoteName(configure_script)
+ with_version_suffix(); + with_version_suffix();
lyxerr[Debug::INIT] lyxerr[Debug::INIT]
<< "<package>\n" << "<package>\n"
@ -357,8 +357,8 @@ string const get_temp_dir()
{ {
#if defined (USE_WINDOWS_PACKAGING) #if defined (USE_WINDOWS_PACKAGING)
// Typical example: C:/TEMP/. // Typical example: C:/TEMP/.
char path[PATH_MAX]; char path[MAX_PATH];
GetTempPath(PATH_MAX, path); GetTempPath(MAX_PATH, path);
return os::internal_path(path); return os::internal_path(path);
#else // Posix-like. #else // Posix-like.
return "/tmp"; return "/tmp";
@ -436,8 +436,9 @@ string const abs_path_from_binary_name(string const & exe)
{ {
string const abs_binary = get_binary_path(exe); string const abs_binary = get_binary_path(exe);
if (abs_binary.empty()) { if (abs_binary.empty()) {
lyxerr << bformat(_("Unable to determine the path to the " // FIXME UNICODE
"LyX binary from the command line %1$s"), lyxerr << bformat(lyx::to_utf8(_("Unable to determine the path to the "
"LyX binary from the command line %1$s")),
exe) exe)
<< std::endl; << std::endl;
bail_out(); bail_out();
@ -557,13 +558,14 @@ get_system_support_dir(string const & abs_binary,
searched_dirs_str += *it; searched_dirs_str += *it;
} }
lyxerr << bformat(_("Unable to determine the system directory " // FIXME UNICODE
"having searched\n" lyxerr << bformat(lyx::to_utf8(_("Unable to determine the system directory "
"\t%1$s\n" "having searched\n"
"Use the '-sysdir' command line parameter or " "\t%1$s\n"
"set the environment variable LYX_DIR_14x to " "Use the '-sysdir' command line parameter or "
"the LyX system directory containing the file " "set the environment variable LYX_DIR_14x to "
"`chkconfig.ltx'."), "the LyX system directory containing the file "
"`chkconfig.ltx'.")),
searched_dirs_str) searched_dirs_str)
<< std::endl; << std::endl;
@ -642,8 +644,9 @@ bool check_command_line_dir(string const & dir,
{ {
string const abs_path = fileSearch(dir, file); string const abs_path = fileSearch(dir, file);
if (abs_path.empty()) { if (abs_path.empty()) {
lyxerr << bformat(_("Invalid %1$s switch.\n" // FIXME UNICODE
"Directory %2$s does not contain %3$s."), lyxerr << bformat(lyx::to_utf8(_("Invalid %1$s switch.\n"
"Directory %2$s does not contain %3$s.")),
command_line_switch, dir, file) command_line_switch, dir, file)
<< std::endl; << std::endl;
} }
@ -668,8 +671,9 @@ bool check_env_var_dir(string const & dir,
{ {
string const abs_path = fileSearch(dir, file); string const abs_path = fileSearch(dir, file);
if (abs_path.empty()) { if (abs_path.empty()) {
lyxerr << bformat(_("Invalid %1$s environment variable.\n" // FIXME UNICODE
"Directory %2$s does not contain %3$s."), lyxerr << bformat(lyx::to_utf8(_("Invalid %1$s environment variable.\n"
"Directory %2$s does not contain %3$s.")),
env_var, dir, file) env_var, dir, file)
<< std::endl; << std::endl;
} }
@ -690,8 +694,9 @@ bool check_env_var_dir(string const & dir,
// search mechanism in po/Makefile.in.in will register // search mechanism in po/Makefile.in.in will register
// package.C.in as a file containing strings that need // package.C.in as a file containing strings that need
// translation. // translation.
// FIXME UNICODE
string const fmt = string const fmt =
_("Invalid %1$s environment variable.\n%2$s is not a directory."); lyx::to_utf8(_("Invalid %1$s environment variable.\n%2$s is not a directory."));
lyxerr << bformat(fmt, env_var, dir) lyxerr << bformat(fmt, env_var, dir)
<< std::endl; << std::endl;