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

IDE: fpc msg parser: skip empty lines in linker errors, bug #28579

Browse Source 
git-svn-id: trunk@49721 -
This commit is contained in:
mattias 2015-08-28 10:29:58 +00:00
parent fa63f29cec
commit 15cf5f6d7e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ide/etfpcmsgparser.pas
View File

@ -1235,7 +1235,7 @@ begin
MsgLine.SubTool:=SubToolFPC; MsgLine.SubTool:=SubToolFPC;
MsgLine.Filename:=AFilename; MsgLine.Filename:=AFilename;
MsgLine.Msg:=OldP; MsgLine.Msg:=OldP;
AddMsgLine(MsgLine); inherited AddMsgLine(MsgLine);
Result:=true; Result:=true;
end; end;
@ -1253,7 +1253,7 @@ begin
MsgLine.SubTool:=SubToolFPC; MsgLine.SubTool:=SubToolFPC;
MsgLine.Urgency:=mluProgress; MsgLine.Urgency:=mluProgress;
MsgLine.Msg:=OldP; MsgLine.Msg:=OldP;
AddMsgLine(MsgLine); inherited AddMsgLine(MsgLine);
Result:=true; Result:=true;
end; end;
@ -1391,7 +1391,7 @@ begin
MsgLine.SubTool:=SubToolFPC; MsgLine.SubTool:=SubToolFPC;
MsgLine.Urgency:=mluProgress; MsgLine.Urgency:=mluProgress;
MsgLine.Msg:=OldP; MsgLine.Msg:=OldP;
AddMsgLine(MsgLine); inherited AddMsgLine(MsgLine);
Result:=true; Result:=true;
end; end;
@ -1412,7 +1412,7 @@ begin
MsgLine.SubTool:=SubToolFPC; MsgLine.SubTool:=SubToolFPC;
MsgLine.Urgency:=mluProgress; MsgLine.Urgency:=mluProgress;
MsgLine.Msg:=OldStart; MsgLine.Msg:=OldStart;
AddMsgLine(MsgLine); inherited AddMsgLine(MsgLine);
Result:=true; Result:=true;
end; end;
@ -1446,7 +1446,7 @@ begin
MsgLine.SubTool:=SubToolFPC; MsgLine.SubTool:=SubToolFPC;
MsgLine.Urgency:=mluProgress; MsgLine.Urgency:=mluProgress;
MsgLine.Msg:=OldStart; MsgLine.Msg:=OldStart;
AddMsgLine(MsgLine); inherited AddMsgLine(MsgLine);
end; end;
function TIDEFPCParser.CheckForWindresErrors(p: PChar): boolean; function TIDEFPCParser.CheckForWindresErrors(p: PChar): boolean;
@ -1595,8 +1595,11 @@ begin
MsgLine:=inherited CreateMsgLine(i); MsgLine:=inherited CreateMsgLine(i);
MsgLine.MsgID:=0; MsgLine.MsgID:=0;
MsgLine.SubTool:=SubToolFPCLinker; MsgLine.SubTool:=SubToolFPCLinker;
MsgLine.Urgency:=mluImportant; if MsgLine.Msg<>'' then
AddMsgLine(MsgLine); MsgLine.Urgency:=mluImportant
else
MsgLine.Urgency:=mluVerbose2;
inherited AddMsgLine(MsgLine);
end; end;
end; end;
@ -1614,7 +1617,7 @@ var
i: Integer; i: Integer;
MsgLine: TMessageLine; MsgLine: TMessageLine;
begin begin
// find message "Linking ..." // find message "Calling resource compiler ..."
i:=Tool.WorkerMessages.Count-1; i:=Tool.WorkerMessages.Count-1;
while (i>=0) and (Tool.WorkerMessages[i].MsgID<>FPCMsgIDCallingResourceCompiler) do while (i>=0) and (Tool.WorkerMessages[i].MsgID<>FPCMsgIDCallingResourceCompiler) do
dec(i); dec(i);
@ -1624,8 +1627,11 @@ begin
MsgLine:=inherited CreateMsgLine(i); MsgLine:=inherited CreateMsgLine(i);
MsgLine.MsgID:=0; MsgLine.MsgID:=0;
MsgLine.SubTool:=SubToolFPCRes; MsgLine.SubTool:=SubToolFPCRes;
MsgLine.Urgency:=mluHint; if MsgLine.Msg<>'' then
AddMsgLine(MsgLine); MsgLine.Urgency:=mluHint
else
MsgLine.Urgency:=mluVerbose2;
inherited AddMsgLine(MsgLine);
end; end;
end; end;