anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Packaging fix on Windows

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9863 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-04-22 20:32:57 +00:00
parent 62c0de61f7
commit a00e3f68d3
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/ChangeLog
View File

@ -1,3 +1,10 @@
2005-04-22 Angus Leeming <leeming@lyx.org>
* package.C.in (get_binary_path): on prompting from Rob Bearman,
ensure that the name of the executable, as input at the command
line has a ".exe" suffix so that various file interogations
work on Windows.
2005-04-22 Angus Leeming <leeming@lyx.org>
* forkedcontr.h:

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

@ -414,7 +414,16 @@ string const abs_path_from_command_line(string const & command_line)
// Does the grunt work for abs_path_from_binary_name()
string const get_binary_path(string const & exe)
{
#if defined (USE_WINDOWS_PACKAGING)
// The executable may have been invoked either with or
// without the .exe extension.
// Ensure that it is present.
string const as_internal_path = os::internal_path(exe);
string const exe_path = suffixIs(as_internal_path, ".exe") ?
as_internal_path : as_internal_path + ".exe";
#else
string const exe_path = os::internal_path(exe);
#endif
if (os::is_absolute_path(exe_path))
return exe_path;