paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 18:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Codetools: use CreateRelativePath() in FixIncludeFilenames.

Browse Source 
git-svn-id: trunk@41544 -
This commit is contained in:
juha 2013-06-04 21:42:09 +00:00
parent 55b6eaf68a
commit a15d7330b6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/codetools/stdcodetools.pas
View File

@ -6405,8 +6405,7 @@ var
end; end;
end;} end;}
procedure Add(FilenameSrcPos: integer; const AFilename: string; procedure Add(FilenameSrcPos: integer; const AFilename: string; Found: boolean);
Found: boolean);
var var
NewFilename: String; NewFilename: String;
p: PCodeXYPosition; p: PCodeXYPosition;
@ -6429,8 +6428,7 @@ var
end; end;
end; end;
function SearchIncludeFilename(FilenameSrcPos: integer; function SearchIncludeFilename(FilenameSrcPos: integer; const AFilename: string): string;
const AFilename: string): string;
var var
AFilePath: String; AFilePath: String;
BaseDir: String; BaseDir: String;
@ -6453,7 +6451,7 @@ var
if AFilePath<>'' then begin if AFilePath<>'' then begin
// search relative to unit // search relative to unit
CurFilename:=DirectoryCache.Pool.FindDiskFilename(BaseDir+Result,true); CurFilename:=DirectoryCache.Pool.FindDiskFilename(BaseDir+Result,true);
Result:=copy(CurFilename,length(BaseDir)+1,length(CurFilename)); Result:=CreateRelativePath(CurFilename, BaseDir);
if FileExistsCached(CurFilename) then if FileExistsCached(CurFilename) then
Add(FilenameSrcPos,CurFilename,true) Add(FilenameSrcPos,CurFilename,true)
else else
@ -6468,8 +6466,7 @@ var
if Scanner.Values.IsDefined('DELPHI') then if Scanner.Values.IsDefined('DELPHI') then
PathDivider:=':' PathDivider:=':'
end; end;
CurFilename:=SearchFileInPath(Result,BaseDir,IncludePath,PathDivider, CurFilename:=SearchFileInPath(Result,BaseDir,IncludePath,PathDivider, ctsfcAllCase);
ctsfcAllCase);
if CurFilename<>'' then begin if CurFilename<>'' then begin
// found // found
Result:=CreateRelativePath(CurFilename,BaseDir); Result:=CreateRelativePath(CurFilename,BaseDir);