paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-27 07:41:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE/lazbuild: check duplicate files: do not warn single files when sharing directories

Browse Source 
git-svn-id: trunk@48405 -
This commit is contained in:
mattias 2015-03-17 11:45:54 +00:00
parent 5cde3a8237
commit a6a61ddf51
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packager/interpkgconflictfiles.pas
View File

@ -94,7 +94,7 @@ type
public public
CompiledFiles: TPGInterPkgFileArray; CompiledFiles: TPGInterPkgFileArray;
Sources: TPGInterPkgFileArray; Sources: TPGInterPkgFileArray;
function Add(PPUorSrc, CounterPart: TPGInterPkgFile): integer; function Add(SrcFile, PPUFile: TPGInterPkgFile): integer;
function IndexOfOwner(OwnerInfo: TPGInterPkgOwnerInfo): integer; function IndexOfOwner(OwnerInfo: TPGInterPkgOwnerInfo): integer;
procedure Switch(Index1, Index2: integer); procedure Switch(Index1, Index2: integer);
end; end;
@ -169,30 +169,22 @@ end;
{ TPGIPAmbiguousFileGroup } { TPGIPAmbiguousFileGroup }
function TPGIPAmbiguousFileGroup.Add(PPUorSrc, CounterPart: TPGInterPkgFile function TPGIPAmbiguousFileGroup.Add(SrcFile, PPUFile: TPGInterPkgFile
): integer; ): integer;
begin begin
if (PPUorSrc=nil) then if (SrcFile=nil) and (PPUFile=nil) then
RaiseException(''); RaiseException('');
if (CounterPart<>nil) and (CounterPart.OwnerInfo<>PPUorSrc.OwnerInfo) then if (SrcFile<>nil) and (PPUFile<>nil) and (PPUFile.OwnerInfo<>SrcFile.OwnerInfo) then
RaiseException('');
if (SrcFile<>nil) and FilenameIsCompiledSource(SrcFile.ShortFilename) then
RaiseException('');
if (PPUFile<>nil) and not FilenameIsCompiledSource(PPUFile.ShortFilename) then
RaiseException(''); RaiseException('');
Result:=length(CompiledFiles); Result:=length(CompiledFiles);
SetLength(CompiledFiles,Result+1); SetLength(CompiledFiles,Result+1);
SetLength(Sources,Result+1); SetLength(Sources,Result+1);
if FilenameIsCompiledSource(PPUorSrc.ShortFilename) then Sources[Result]:=SrcFile;
begin CompiledFiles[Result]:=PPUFile
CompiledFiles[Result]:=PPUorSrc;
if (CounterPart<>nil) and FilenameIsPascalUnit(CounterPart.ShortFilename) then
Sources[Result]:=CounterPart
else
Sources[Result]:=nil;
end else begin
Sources[Result]:=PPUorSrc;
if (CounterPart<>nil) and FilenameIsCompiledSource(CounterPart.ShortFilename) then
CompiledFiles[Result]:=CounterPart
else
CompiledFiles[Result]:=nil;
end;
end; end;
function TPGIPAmbiguousFileGroup.IndexOfOwner(OwnerInfo: TPGInterPkgOwnerInfo function TPGIPAmbiguousFileGroup.IndexOfOwner(OwnerInfo: TPGInterPkgOwnerInfo
@ -873,12 +865,21 @@ var
FindUnitSourcePPU(OtherFile,OtherPPUFile); FindUnitSourcePPU(OtherFile,OtherPPUFile);
if FileGroup=nil then if FileGroup=nil then
FindUnitSourcePPU(CurUnit,PPUFile); FindUnitSourcePPU(CurUnit,PPUFile);
if (CurUnit<>nil) and (OtherFile<>nil)
and (CompareFilenames(CurUnit.FullFilename,OtherFile.FullFilename)=0) then
begin
// two packages share source directories
// -> do not warn single files
continue;
end;
debugln(['CheckPPUFilesInWrongDirs duplicate units found: file1="',CurUnit.FullFilename,'"(',CurUnit.OwnerInfo.Name,') ppu=',PPUFile<>nil,' file2="',OtherFile.FullFilename,'"(',OtherFile.OwnerInfo.Name,') ppu=',OtherPPUFile<>nil]);
if (PPUFile<>nil) and (OtherPPUFile<>nil) if (PPUFile<>nil) and (OtherPPUFile<>nil)
and (CompareFilenames(PPUFile.FullFilename,OtherPPUFile.FullFilename)=0) and (CompareFilenames(PPUFile.FullFilename,OtherPPUFile.FullFilename)=0)
and (OtherFile=nil) then begin and (OtherFile=nil) then begin
// the same ppu is in both packages // the same ppu is in both packages
// and only one package has a source // ... and only one package has a source
// for example: two packages share output directories // for example: two packages share output directories
// => ok // => ok
continue; continue;
@ -916,7 +917,7 @@ var
Msg+=', orphaned ppu "'+CurUnit.FullFilename+'"'; Msg+=', orphaned ppu "'+CurUnit.FullFilename+'"';
end; end;
if IDEMessagesWindow<>nil then if IDEMessagesWindow<>nil then
IDEMessagesWindow.AddCustomMessage(mluWarning,Msg) IDEMessagesWindow.AddCustomMessage(mluNote,Msg)
else else
debugln('Warning: ',Msg); debugln('Warning: ',Msg);
end; end;