paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 14:38:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazBuild: Fix AV, remove EnvironmentGuiOpts dependency from compiler.pp. Issue #40318.

Browse Source
This commit is contained in:
Juha 2023-06-15 00:25:10 +03:00
parent 08283ae760
commit 80a2091176
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/buildintf/ideexterntoolintf.pas
View File

@ -325,7 +325,6 @@ type
private
FHideHintsSenderNotUsed: boolean;
FHideHintsUnitNotUsedInMainSource: boolean;
FShowLinesCompiled: boolean;
FUseTranslationUrgency: boolean;
protected
FFilesToIgnoreUnitNotUsed: TStrings;
@ -339,8 +338,6 @@ type
class function GetFPCMsgValues(Msg: TMessageLine; out Value1, Value2: string): boolean; virtual; abstract;
property FilesToIgnoreUnitNotUsed: TStrings read FFilesToIgnoreUnitNotUsed
write FFilesToIgnoreUnitNotUsed;
property ShowLinesCompiled: boolean read FShowLinesCompiled
write FShowLinesCompiled default false;
property HideHintsSenderNotUsed: boolean read FHideHintsSenderNotUsed
write FHideHintsSenderNotUsed default true;
property HideHintsUnitNotUsedInMainSource: boolean

3
ide/compiler.pp
View File

@ -50,7 +50,7 @@ uses
// IdeIntf
IDEMsgIntf, LazIDEIntf,
// IDE
IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project, EnvGuiOptions;
IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project;
type
TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) of object;
@ -348,7 +348,6 @@ begin
if CompilerKind=pcPas2js then
SubTool:=SubToolPas2js;
FPCParser:=TFPCParser(Tool.AddParsers(SubTool));
FPCParser.ShowLinesCompiled:=EnvironmentGuiOpts.MsgViewShowFPCMsgLinesCompiled;
FPCParser.HideHintsSenderNotUsed:=not AProject.CompilerOptions.ShowHintsForSenderNotUsed;
FPCParser.HideHintsUnitNotUsedInMainSource:=not AProject.CompilerOptions.ShowHintsForUnusedUnitsInMainSrc;
if (not AProject.CompilerOptions.ShowHintsForUnusedUnitsInMainSrc)

7
ide/etfpcmsgparser.pas
View File

@ -47,7 +47,7 @@ uses
// IdeConfig
EnvironmentOpts, LazConf,
// IDE
IDECmdLine, LazarusIDEStrConsts, TransferMacros, etMakeMsgParser;
IDECmdLine, LazarusIDEStrConsts, TransferMacros, etMakeMsgParser, EnvGuiOptions;
const
FPCMsgIDCompiling = 3104;
@ -1441,7 +1441,7 @@ begin
Result:=true;
MsgLine:=CreateMsgLine;
MsgLine.SubTool:=DefaultSubTool;
if ShowLinesCompiled then
if EnvironmentGuiOpts.MsgViewShowFPCMsgLinesCompiled then
MsgLine.Urgency:=mluImportant
else
MsgLine.Urgency:=mluVerbose;
@ -2744,7 +2744,8 @@ begin
FPCMsgIDThereWereErrorsCompiling: // There were $1 errors compiling module, stopping
MsgUrgency:=mluVerbose;
FPCMsgIDLinesCompiled: // n lines compiled, m sec
if ShowLinesCompiled then MsgUrgency:=mluImportant;
if EnvironmentGuiOpts.MsgViewShowFPCMsgLinesCompiled then
MsgUrgency:=mluImportant;
end;
MsgLine:=CreateMsgLine;
MsgLine.SubTool:=DefaultSubTool;