paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 15:41:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: checking orphaned ppu files: ignore shared directories

Browse Source 
git-svn-id: trunk@48010 -
This commit is contained in:
mattias 2015-02-26 08:21:07 +00:00
parent b2140c01fa
commit 4a1432da74
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packager/interpkgconflictfiles.pas
View File

@ -495,6 +495,16 @@ var
// other unit with same name found
OtherNode:=OtherNode.Successor;
if OtherFile.OwnerInfo=aPPUFile.OwnerInfo then continue;
if CompareFilenames(aPPUFile.FullFilename,OtherFile.FullFilename)=0 then
begin
// two packages share directories
// it would would require a lenghty codetools check to find out
// if this is right or wrong
// => skip
continue;
end;
// ppu in one package, unit with same name in another package
if OptionUrAllowsDuplicate(aPPUFile,OtherFile) then continue;
//debugln(['CheckPPUFilesInWrongDirs duplicate units found: file1="',aPPUFile.FullFilename,'"(',aPPUFile.OwnerInfo.Name,') file2="',OtherFile.FullFilename,'"(',OtherFile.OwnerInfo.Name,')']);
@ -557,6 +567,16 @@ var
while OtherNode<>nil do begin
OtherFile:=TPGInterPkgFile(OtherNode.Data);
if (ComparePGInterPkgShortFilename(CurFile,OtherFile)<>0) then break;
if CompareFilenames(CurFile.FullFilename,OtherFile.FullFilename)=0 then
begin
// two packages share directories
// it would would require a lenghty codetools check to find out
// if this is right or wrong
// => skip
continue;
end;
// other file with same short name found
OtherNode:=OtherNode.Successor;
if OtherFile.OwnerInfo=CurFile.OwnerInfo then continue;