paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 21:50:16 +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 private
FHideHintsSenderNotUsed: boolean; FHideHintsSenderNotUsed: boolean;
FHideHintsUnitNotUsedInMainSource: boolean; FHideHintsUnitNotUsedInMainSource: boolean;
FShowLinesCompiled: boolean;
FUseTranslationUrgency: boolean; FUseTranslationUrgency: boolean;
protected protected
FFilesToIgnoreUnitNotUsed: TStrings; FFilesToIgnoreUnitNotUsed: TStrings;
@ -339,8 +338,6 @@ type
class function GetFPCMsgValues(Msg: TMessageLine; out Value1, Value2: string): boolean; virtual; abstract; class function GetFPCMsgValues(Msg: TMessageLine; out Value1, Value2: string): boolean; virtual; abstract;
property FilesToIgnoreUnitNotUsed: TStrings read FFilesToIgnoreUnitNotUsed property FilesToIgnoreUnitNotUsed: TStrings read FFilesToIgnoreUnitNotUsed
write FFilesToIgnoreUnitNotUsed; write FFilesToIgnoreUnitNotUsed;
property ShowLinesCompiled: boolean read FShowLinesCompiled
write FShowLinesCompiled default false;
property HideHintsSenderNotUsed: boolean read FHideHintsSenderNotUsed property HideHintsSenderNotUsed: boolean read FHideHintsSenderNotUsed
write FHideHintsSenderNotUsed default true; write FHideHintsSenderNotUsed default true;
property HideHintsUnitNotUsedInMainSource: boolean property HideHintsUnitNotUsedInMainSource: boolean

3
ide/compiler.pp
View File

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

7
ide/etfpcmsgparser.pas
View File

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