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

IDE: started checking duplicate units

Browse Source 
git-svn-id: trunk@48116 -
This commit is contained in:
mattias 2015-03-03 13:43:19 +00:00
parent 2a879e42d4
commit c5128925c6
23 changed files with 44 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/languages/lclstrconsts.ca.po
View File

@ -1572,12 +1572,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.cs.po
View File

@ -1534,12 +1534,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.de.po
View File

@ -1535,12 +1535,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.es.po
View File

@ -1570,12 +1570,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.fi.po
View File

@ -1528,12 +1528,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

8
lcl/languages/lclstrconsts.fr.po
View File

@ -1539,14 +1539,6 @@ msgstr "%s MB"
msgid "Name"
msgstr "Nom"
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
"L'élément choisi n'existe pas sur le disque :\n"
"\"%s\"\n"
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr "Taille"

6
lcl/languages/lclstrconsts.he.po
View File

@ -1584,12 +1584,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.hu.po
View File

@ -1530,12 +1530,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.id.po
View File

@ -1571,12 +1571,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.it.po
View File

@ -1534,12 +1534,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.ja.po
View File

@ -1561,12 +1561,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.lt.po
View File

@ -1561,12 +1561,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.nl.po
View File

@ -1564,12 +1564,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.no.po
View File

@ -1576,12 +1576,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.pl.po
View File

@ -1542,12 +1542,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.po
View File

@ -1523,12 +1523,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.pt_BR.po
View File

@ -1558,12 +1558,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

8
lcl/languages/lclstrconsts.ru.po
View File

@ -1536,14 +1536,6 @@ msgstr "%s МБ"
msgid "Name"
msgstr "Имя"
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
"Выбранный элемент отсутствует на диске:\n"
"\"%s\"\n"
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr "Размер"

6
lcl/languages/lclstrconsts.sk.po
View File

@ -1571,12 +1571,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.tr.po
View File

@ -1571,12 +1571,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.uk.po
View File

@ -1561,12 +1561,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

6
lcl/languages/lclstrconsts.zh_CN.po
View File

@ -1577,12 +1577,6 @@ msgstr ""
msgid "Name"
msgstr ""
#: lclstrconsts.sshellctrlsselecteditemdoesnotexists
msgid ""
"The selected item does not exist on disk:\n"
"\"%s\"\n"
msgstr ""
#: lclstrconsts.sshellctrlssize
msgid "Size"
msgstr ""

67
packager/interpkgconflictfiles.pas
View File

@ -45,13 +45,6 @@
unit_u_recompile_obj_older_than_asm=10033_U_Recompiling unit, obj is older than asm
unit_w_cant_compile_unit_with_changed_incfile=10040_W_Can't recompile unit $1, but found modifed include files
unit_u_source_modified=10041_U_File $1 is newer than the one used for creating PPU file $2
- test orphaned ppu, 2 ppu, 1 src
- test orphaned ppu, 2 ppu, 0 src
- test orphaned ppu, 1 ppu, 1 src (other pkg)
- test duplicate src, 0 ppu, 2 src
- test duplicate src, 1 ppu, 2 src
- test duplicate src, 2 ppu, 2 src
- test duplicate inc
}
unit InterPkgConflictFiles;
@ -143,6 +136,7 @@ type
function CheckInterPkgFiles(IDEObject: TObject;
PkgList: TFPList; out FilesChanged: boolean
): boolean; // returns false if user cancelled
function FilenameIsCompiledSource(aFilename: string): boolean;
implementation
@ -180,31 +174,41 @@ function TPGIPAmbiguousFileGroup.Add(PPUorSrc, CounterPart: TPGInterPkgFile
begin
if (PPUorSrc=nil) then
RaiseException('');
if (CounterPart<>nil) and (CounterPart.OwnerInfo<>PPUorSrc.OwnerInfo) then
RaiseException('');
Result:=length(CompiledFiles);
SetLength(CompiledFiles,Result+1);
SetLength(Sources,Result+1);
if FilenameIsPascalUnit(PPUorSrc.ShortFilename) then
if FilenameIsCompiledSource(PPUorSrc.ShortFilename) then
begin
Sources[Result]:=PPUorSrc;
if (CounterPart=nil) or FilenameIsPascalUnit(CounterPart.ShortFilename) then
CompiledFiles[Result]:=nil
else
CompiledFiles[Result]:=CounterPart;
end else begin
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;
function TPGIPAmbiguousFileGroup.IndexOfOwner(OwnerInfo: TPGInterPkgOwnerInfo
): integer;
begin
Result:=length(CompiledFiles)-1;
while (Result>=0) and (CompiledFiles[Result].OwnerInfo<>OwnerInfo) do
Result:=length(Sources)-1;
while (Result>=0) do
begin
if (Sources[Result]<>nil) then
begin
if (Sources[Result].OwnerInfo=OwnerInfo) then exit;
end else begin
if (CompiledFiles[Result].OwnerInfo=OwnerInfo) then exit;
end;
dec(Result);
end;
end;
procedure TPGIPAmbiguousFileGroup.Switch(Index1, Index2: integer);
@ -276,6 +280,7 @@ procedure TPGIPConflictsDialog.DeleteSelectedFilesButtonClick(Sender: TObject);
if DeleteFileInteractive(aFilename)<>mrOk then exit(false);
if FilenameIsPascalUnit(aFilename) then
begin
// unit source -> delete compiled files and resources
DeleteFileUTF8(ChangeFileExt(aFilename,'.ppu'));
DeleteFileUTF8(ChangeFileExt(aFilename,'.o'));
DeleteFileUTF8(ChangeFileExt(aFilename,'.rst'));
@ -283,8 +288,8 @@ procedure TPGIPConflictsDialog.DeleteSelectedFilesButtonClick(Sender: TObject);
DeleteFileUTF8(ChangeFileExt(aFilename,'.lfm'));
DeleteFileUTF8(ChangeFileExt(aFilename,'.dfm'));
DeleteFileUTF8(ChangeFileExt(aFilename,'.xfm'));
end else if (CompareFileExt(aFilename,'ppu')=0)
or (CompareFileExt(aFilename,'o')=0) then begin
end else if FilenameIsCompiledSource(aFilename) then begin
// compiled file -> delete compiled files. Keep sources.
DeleteFileUTF8(ChangeFileExt(aFilename,'.ppu'));
DeleteFileUTF8(ChangeFileExt(aFilename,'.o'));
DeleteFileUTF8(ChangeFileExt(aFilename,'.rst'));
@ -641,10 +646,10 @@ var
Ext:=LowerCase(ExtractFileExt(aFilename));
AnUnitName:='';
case Ext of
'.ppu','.o','.pas','.pp','.p':
'.ppu','.o','.rst','.rsj','.pas','.pp','.p':
if not IsIncDir then
begin
AnUnitName:=ExtractFilename(aFilename);
AnUnitName:=ExtractFileNameOnly(aFilename);
if not IsDottedIdentifier(AnUnitName) then continue;
end;
'.inc', '.lfm', '.dfm': ;
@ -706,7 +711,8 @@ var
ONode:=Node;
Node:=Node.Successor;
OFile:=TPGInterPkgFile(ONode.Data);
if CompareFileExt(OFile.ShortFilename,'o')<>0 then continue;
if not FilenameIsCompiledSource(OFile.ShortFilename) then continue;
if CompareFileExt(OFile.ShortFilename,'.ppu',false)=0 then continue;
// search corresponding .ppu
PPUFileName:=ChangeFileExt(OFile.FullFilename,'.ppu');
SearchFile:=TPGInterPkgFile.Create(PPUFileName,'',nil);
@ -840,6 +846,7 @@ var
FirstNodeSameUnitname:=CurNode;
CurNode:=CurNode.Successor;
if CurUnit.OwnerInfo.HasOptionUr then continue;
// CurUnit is an unit without -Ur
// => check units with same name
FileGroup:=nil;
@ -888,7 +895,10 @@ var
Msg+=' in "'+CurUnit.OwnerInfo.Name+'"';
Msg+=', orphaned ppu "'+CurUnit.FullFilename+'"';
end;
IDEMessagesWindow.AddCustomMessage(mluWarning,Msg);
if IDEMessagesWindow<>nil then
IDEMessagesWindow.AddCustomMessage(mluWarning,Msg)
else
debugln('Warning: ',Msg);
end;
end;
@ -951,7 +961,10 @@ var
Msg:='Duplicate file "'+CurFile.AnUnitName+'"';
Msg+=' in "'+CurFile.OwnerInfo.Name+'"';
Msg+=', path="'+CurFile.FullFilename+'"';
IDEMessagesWindow.AddCustomMessage(mluWarning,Msg);
if IDEMessagesWindow<>nil then
IDEMessagesWindow.AddCustomMessage(mluWarning,Msg)
else
debugln('Warning: ',Msg);
end;
end;
@ -1022,5 +1035,13 @@ begin
end;
end;
function FilenameIsCompiledSource(aFilename: string): boolean;
var
Ext: String;
begin
Ext:=lowercase(ExtractFileExt(aFilename));
Result:=(Ext='.ppu') or (Ext='.o') or (Ext='.rst') or (Ext='.rsj');
end;
end.