paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 09:59:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: env opts:: compiler messages filename: use standard function to expand

Browse Source 
git-svn-id: trunk@36060 -
This commit is contained in:
mattias 2012-03-16 01:26:31 +00:00
parent 61728410d2
commit b2014918ec
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/buildmanager.pas
View File

@ -1686,7 +1686,7 @@ end;
function TBuildManager.MacroFuncFPCMsgFile(const Param: string;
const Data: PtrInt; var Abort: boolean): string;
begin
Result:=EnvironmentOptions.CompilerMessagesFilename;
Result:=EnvironmentOptions.GetParsedCompilerMessagesFilename;
end;
function TBuildManager.MacroFuncMake(const Param: string; const Data: PtrInt;

30
ide/environmentopts.pp
View File

@ -264,7 +264,6 @@ type
FCompilerFileHistory: TStringList;
FFPCSourceDirHistory: TStringList;
FMakeFileHistory: TStringList;
FCompilerMessagesFilename: string;
FCompilerMessagesFileHistory: TStringList;
// TODO: store per debuggerclass options
@ -327,12 +326,14 @@ type
FFileDialogFilter: string;
function GetCompilerFilename: string;
function GetCompilerMessagesFilename: string;
function GetDebuggerEventLogColors(AIndex: TDBGEventType): TDebuggerEventLogColor;
function GetFPCSourceDirectory: string;
function GetLazarusDirectory: string;
function GetMakeFilename: string;
function GetTestBuildDirectory: string;
procedure SetCompilerFilename(const AValue: string);
procedure SetCompilerMessagesFilename(AValue: string);
procedure SetDebuggerEventLogColors(AIndex: TDBGEventType;
const AValue: TDebuggerEventLogColor);
procedure SetDebuggerSearchPath(const AValue: string);
@ -364,6 +365,7 @@ type
function GetParsedCompilerFilename: string;
function GetParsedFPCSourceDirectory: string;
function GetParsedMakeFilename: string;
function GetParsedCompilerMessagesFilename: string;
function GetParsedValue(o: TEnvOptParseType): string;
// macro functions
@ -520,8 +522,8 @@ type
property DebuggerEventLogUseColors: Boolean read FDebuggerEventLogUseColors write FDebuggerEventLogUseColors;
property DebuggerEventLogColors[AIndex: TDBGEventType]: TDebuggerEventLogColor read GetDebuggerEventLogColors write SetDebuggerEventLogColors;
property CompilerMessagesFilename: string read FCompilerMessagesFilename
write FCompilerMessagesFilename;
property CompilerMessagesFilename: string read GetCompilerMessagesFilename
write SetCompilerMessagesFilename;
property CompilerMessagesFileHistory: TStringList read FCompilerMessagesFileHistory
write FCompilerMessagesFileHistory;
@ -1152,7 +1154,7 @@ begin
if FTestBuildDirHistory.Count=0 then
GetDefaultTestBuildDirs(FTestBuildDirHistory);
CompilerMessagesFilename:=XMLConfig.GetValue(
Path+'CompilerMessagesFilename/Value',FCompilerMessagesFilename);
Path+'CompilerMessagesFilename/Value',CompilerMessagesFilename);
LoadRecentList(XMLConfig, FCompilerMessagesFileHistory,
Path+'CompilerMessagesFilename/History/');
@ -1485,7 +1487,7 @@ begin
SaveRecentList(XMLConfig,FTestBuildDirHistory,
Path+'TestBuildDirectory/History/');
XMLConfig.SetDeleteValue(
Path+'CompilerMessagesFilename/Value',FCompilerMessagesFilename,'');
Path+'CompilerMessagesFilename/Value',CompilerMessagesFilename,'');
SaveRecentList(XMLConfig,FCompilerMessagesFileHistory,
Path+'CompilerMessagesFilename/History/');
@ -1690,6 +1692,11 @@ begin
Result:=GetParsedValue(eopMakeFilename);
end;
function TEnvironmentOptions.GetParsedCompilerMessagesFilename: string;
begin
Result:=GetParsedValue(eopCompilerMessagesFilename);
end;
function TEnvironmentOptions.GetParsedValue(o: TEnvOptParseType): string;
begin
with FParseValues[o] do begin
@ -1935,6 +1942,14 @@ begin
SetParseValue(eopCompilerFilename,NewValue);
end;
procedure TEnvironmentOptions.SetCompilerMessagesFilename(AValue: string);
var
NewValue: String;
begin
NewValue:=TrimFilename(AValue);
SetParseValue(eopCompilerMessagesFilename,NewValue);
end;
function TEnvironmentOptions.GetDebuggerEventLogColors(AIndex: TDBGEventType): TDebuggerEventLogColor;
begin
Result := FDebuggerEventLogColors[AIndex];
@ -1945,6 +1960,11 @@ begin
Result:=FParseValues[eopCompilerFilename].UnparsedValue;
end;
function TEnvironmentOptions.GetCompilerMessagesFilename: string;
begin
Result:=FParseValues[eopCompilerMessagesFilename].UnparsedValue;
end;
function TEnvironmentOptions.GetFPCSourceDirectory: string;
begin
Result:=FParseValues[eopFPCSourceDirectory].UnparsedValue;

2
ide/idefpcinfo.pas
View File

@ -231,7 +231,7 @@ begin
sl.Add('LazarusDirectory='+EnvironmentOptions.LazarusDirectory);
sl.Add('CompilerFilename='+EnvironmentOptions.CompilerFilename);
sl.Add('ResolvedCompilerFilename='+EnvironmentOptions.GetParsedCompilerFilename);
sl.Add('CompilerMessagesFilename='+EnvironmentOptions.CompilerMessagesFilename);
sl.Add('CompilerMessagesFilename='+EnvironmentOptions.GetParsedCompilerMessagesFilename);
sl.Add('');
end;

2
ide/ideinfodlg.pas
View File

@ -224,7 +224,7 @@ begin
sl.Add('LazarusDirectory='+EnvironmentOptions.LazarusDirectory);
sl.Add('CompilerFilename='+EnvironmentOptions.CompilerFilename);
sl.Add('Real CompilerFilename='+EnvironmentOptions.GetParsedCompilerFilename);
sl.Add('CompilerMessagesFilename='+EnvironmentOptions.CompilerMessagesFilename);
sl.Add('CompilerMessagesFilename='+EnvironmentOptions.GetParsedCompilerMessagesFilename);
sl.Add('FPC source directory='+EnvironmentOptions.FPCSourceDirectory);
sl.Add('Real FPC source directory='+EnvironmentOptions.GetParsedFPCSourceDirectory);
sl.Add('Test directory='+EnvironmentOptions.GetParsedTestBuildDirectory);