paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 13:40:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fpc sources: ignore fpmake.pp units

Browse Source 
git-svn-id: trunk@25072 -
This commit is contained in:
mattias 2010-04-29 20:59:18 +00:00
parent 1f5959b00a
commit d9a053b0da
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/codetools/definetemplates.pas
View File

@ -1169,6 +1169,9 @@ begin
or (CompareFileExt(Filename,'PP',false)=0)
or (CompareFileExt(Filename,'P',false)=0)
then begin
if CompareFilenameOnly(PChar(Filename),length(Filename),'fpmake',6,true)=0
then
continue; // skip the fpmake.pp files
// Filename is a pascal unit source
Directory:=ExtractFilePath(Filename);
if LastDirectory=Directory then begin
@ -1197,7 +1200,13 @@ begin
Link.Score:=Score;
end else if Link.Score=Score then begin
// unit with same Score => maybe a conflict
Link.ConflictFilename:=Link.ConflictFilename+';'+Filename;
// be deterministic and choose the highest
if CompareStr(Filename,Link.Filename)>0 then begin
Link.ConflictFilename:=Link.ConflictFilename+';'+Link.Filename;
Link.Filename:=Filename;
end else begin
Link.ConflictFilename:=Link.ConflictFilename+';'+Filename;
end;
end;
end else begin
// new unit source found => add to list