lib path problem: does not modify path if a libname starts by ./ or ../
This commit is contained in:
parent
5a948e98b7
commit
80605bf260
|
@ -157,7 +157,8 @@ wxString MakeFileName( const wxString& dir,
|
||||||
* @param dir = path (can be empty)
|
* @param dir = path (can be empty)
|
||||||
* @param shortname = filename with or without path and/or extension
|
* @param shortname = filename with or without path and/or extension
|
||||||
* @param ext = extension (can be empty)
|
* @param ext = extension (can be empty)
|
||||||
* If shortname has an absolute path, or a path start by ./ , the path will not be modified
|
* If shortname has an absolute path, or a path starts by ./ or ../,
|
||||||
|
* the path will not be modified
|
||||||
* If shortname has an extension, it will not be modified
|
* If shortname has an extension, it will not be modified
|
||||||
* @return full filename
|
* @return full filename
|
||||||
*/
|
*/
|
||||||
|
@ -169,15 +170,15 @@ wxString MakeFileName( const wxString& dir,
|
||||||
{
|
{
|
||||||
if( !wxIsAbsolutePath( shortname ) )
|
if( !wxIsAbsolutePath( shortname ) )
|
||||||
{
|
{
|
||||||
wxString left = shortname.Left(2);
|
if( ! shortname.StartsWith(wxT("./")) && ! shortname.StartsWith(wxT("../")) )
|
||||||
if( left != wxT("./") )
|
{ /* no absolute path in shortname, add dir to shortname */
|
||||||
{ /* no absolute path in shortname */
|
|
||||||
fullfilename = dir;
|
fullfilename = dir;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fullfilename += shortname;
|
fullfilename += shortname; // Add shortname to dir or use shortname only
|
||||||
|
|
||||||
fullfilename.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
|
fullfilename.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
|
||||||
|
|
||||||
/* Add an extension if shortname has no extension */
|
/* Add an extension if shortname has no extension */
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
COMMON_GLOBL wxString g_BuildVersion
|
COMMON_GLOBL wxString g_BuildVersion
|
||||||
#ifdef EDA_BASE
|
#ifdef EDA_BASE
|
||||||
(wxT("(2007-10-29)"))
|
(wxT("(2007-11-05)"))
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
Binary file not shown.
3547
internat/fr/kicad.po
3547
internat/fr/kicad.po
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue