paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-20 12:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Refactor, move code from TProjectBuildModes to TBuildMatrixOptions.

Browse Source 
git-svn-id: trunk@45414 -
This commit is contained in:
juha 2014-06-08 23:47:18 +00:00
parent c9836f4278
commit 00e280745a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/modematrixopts.pas
View File

@ -148,6 +148,7 @@ type
procedure GetOutputDirectory(Target, ActiveMode: string; var OutDir: string);
function FindOption(const ID: string): TBuildMatrixOption;
function FindMacro(const MacroName, MacroValue: string): TBuildMatrixOption;
procedure EnableModeIfOptionFound(ModeID, OptionID: String);
end;
EMMMacroSyntaxException = class(Exception)
@ -645,6 +646,15 @@ begin
Result:=nil;
end;
procedure TBuildMatrixOptions.EnableModeIfOptionFound(ModeID, OptionID: String);
var
Opt: TBuildMatrixOption;
begin
Opt:=FindOption(OptionID);
if Assigned(Opt) then
Opt.EnableMode(ModeID);
end;
{ TBuildMatrixOption }
procedure TBuildMatrixOption.SetMacroName(AValue: string);

30
ide/project.pp
View File

@ -669,14 +669,12 @@ type
// Variables used by LoadFromXMLConfig and SaveToXMLConfig
FXMLConfig: TXMLConfig;
FGlobalMatrixOptions: TBuildMatrixOptions;
FModeID, FOptionID: String;
function GetItems(Index: integer): TProjectBuildMode;
function GetModified: boolean;
procedure OnItemChanged(Sender: TObject);
procedure SetModified(const AValue: boolean);
// Used by LoadFromXMLConfig
procedure AddMatrixMacro(const MacroName, MacroValue, ModeIdentifier: string; InSession: boolean);
procedure EnableMatrixMode(MatrixOptions: TBuildMatrixOptions);
procedure LoadSessionEnabledNonSessionMatrixOptions(const Path: string);
procedure LoadOldMacroValues(const Path: string; CurMode: TProjectBuildMode);
procedure LoadNewFormat(const Path: string; Cnt: Integer; LoadData: boolean);
@ -7000,21 +6998,11 @@ begin
end;
end;
procedure TProjectBuildModes.EnableMatrixMode(MatrixOptions: TBuildMatrixOptions);
var
MatrixOption: TBuildMatrixOption;
begin
if MatrixOptions=nil then exit;
MatrixOption:=MatrixOptions.FindOption(FOptionID);
if MatrixOption=nil then exit;
//debugln(['EnableMatrixMode OptionID=',FOptionID,' ModeID=',FModeID,' ',MatrixOption.AsString]);
MatrixOption.EnableMode(FModeID);
end;
procedure TProjectBuildModes.LoadSessionEnabledNonSessionMatrixOptions(const Path: string);
var
i, Cnt: integer;
SubPath: String;
ModeID, OptionID: String;
begin
// disable all matrix options in session modes
if FGlobalMatrixOptions<>nil then
@ -7024,18 +7012,20 @@ begin
Cnt:=FXMLConfig.GetValue(Path+'Count',0);
for i:=1 to Cnt do begin
SubPath:=Path+'Item'+IntToStr(i)+'/';
FModeID:=FXMLConfig.GetValue(SubPath+'Mode','');
if (FModeID='') or (not IsSessionMode(FModeID)) then begin
debugln(['LoadSessionEnabledNonSessionMatrixOptions not a session Mode="',dbgstr(FModeID),'" at ',SubPath]);
ModeID:=FXMLConfig.GetValue(SubPath+'Mode','');
if (ModeID='') or (not IsSessionMode(ModeID)) then begin
debugln(['LoadSessionEnabledNonSessionMatrixOptions not a session Mode="',dbgstr(ModeID),'" at ',SubPath]);
continue;
end;
FOptionID:=FXMLConfig.GetValue(SubPath+'Option','');
if FOptionID='' then begin
OptionID:=FXMLConfig.GetValue(SubPath+'Option','');
if OptionID='' then begin
debugln(['LoadSessionEnabledNonSessionMatrixOptions invalid option at ',SubPath]);
continue;
end;
EnableMatrixMode(FGlobalMatrixOptions);
EnableMatrixMode(SharedMatrixOptions);
if Assigned(FGlobalMatrixOptions) then
FGlobalMatrixOptions.EnableModeIfOptionFound(ModeID, OptionID);
if Assigned(SharedMatrixOptions) then
SharedMatrixOptions.EnableModeIfOptionFound(ModeID, OptionID);
end;
end;