paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 15:20:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed loading session build modes

Browse Source 
git-svn-id: trunk@48754 -
This commit is contained in:
mattias 2015-04-14 08:41:03 +00:00
parent 5b24d52ced
commit 279431884c
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/project.pp
View File

@ -637,11 +637,11 @@ type
// Used by LoadFromXMLConfig // Used by LoadFromXMLConfig
procedure AddMatrixMacro(const MacroName, MacroValue, ModeIdentifier: string; InSession: boolean); procedure AddMatrixMacro(const MacroName, MacroValue, ModeIdentifier: string; InSession: boolean);
procedure LoadSessionEnabledNonSessionMatrixOptions(const Path: string); procedure LoadSessionEnabledNonSessionMatrixOptions(const Path: string);
procedure LoadOtherCompilerOpts(const Path: string; Cnt: Integer; InSession: boolean); procedure LoadOtherCompilerOpts(const Path: string; FromIndex, ToIndex: Integer; InSession: boolean);
procedure LoadMacroValues(const Path: string; CurMode: TProjectBuildMode); procedure LoadMacroValues(const Path: string; CurMode: TProjectBuildMode);
procedure LoadAllMacroValues(const Path: string; Cnt: Integer); procedure LoadAllMacroValues(const Path: string; Cnt: Integer);
procedure LoadOldFormat(const Path: string); procedure LoadOldFormat(const Path: string);
procedure SetActiveMode(const Path: string); procedure LoadActiveBuildMode(const Path: string);
// Used by SaveToXMLConfig // Used by SaveToXMLConfig
procedure SaveSessionData(const Path: string); procedure SaveSessionData(const Path: string);
procedure SaveSharedMatrixOptions(const Path: string); procedure SaveSharedMatrixOptions(const Path: string);
@ -7035,14 +7035,15 @@ begin
end; end;
end; end;
procedure TProjectBuildModes.LoadOtherCompilerOpts(const Path: string; Cnt: Integer; InSession: boolean); procedure TProjectBuildModes.LoadOtherCompilerOpts(const Path: string;
FromIndex, ToIndex: Integer; InSession: boolean);
// Iterate rest of the modes. // Iterate rest of the modes.
var var
i: Integer; i: Integer;
Ident, SubPath: String; Ident, SubPath: String;
CurMode: TProjectBuildMode; CurMode: TProjectBuildMode;
begin begin
for i:=2 to Cnt do for i:=FromIndex to ToIndex do
begin begin
SubPath:=Path+'Item'+IntToStr(i)+'/'; SubPath:=Path+'Item'+IntToStr(i)+'/';
Ident:=FXMLConfig.GetValue(SubPath+'Name',''); Ident:=FXMLConfig.GetValue(SubPath+'Name','');
@ -7108,7 +7109,7 @@ begin
CurMode.CompilerOptions.LoadFromXMLConfig(FXMLConfig,CompOptsPath); CurMode.CompilerOptions.LoadFromXMLConfig(FXMLConfig,CompOptsPath);
end; end;
procedure TProjectBuildModes.SetActiveMode(const Path: string); procedure TProjectBuildModes.LoadActiveBuildMode(const Path: string);
var var
CurMode: TProjectBuildMode; CurMode: TProjectBuildMode;
begin begin
@ -7127,17 +7128,18 @@ begin
Cnt:=FXMLConfig.GetValue(Path+'BuildModes/Count',0); Cnt:=FXMLConfig.GetValue(Path+'BuildModes/Count',0);
if Cnt>0 then begin if Cnt>0 then begin
// Project default mode is stored at the old XML path. Testing the 'Default' // Project default mode is stored at the old XML path for backward compatibility.
// XML attribute is not needed because the first mode is always default. // Testing the 'Default' XML attribute is not needed because the first mode
// is always default.
Items[0].Identifier:=FXMLConfig.GetValue(Path+'BuildModes/Item1/Name', ''); Items[0].Identifier:=FXMLConfig.GetValue(Path+'BuildModes/Item1/Name', '');
Items[0].CompilerOptions.LoadFromXMLConfig(FXMLConfig, 'CompilerOptions/'); Items[0].CompilerOptions.LoadFromXMLConfig(FXMLConfig, 'CompilerOptions/');
LoadOtherCompilerOpts(Path+'BuildModes/', Cnt, False); LoadOtherCompilerOpts(Path+'BuildModes/', 2, Cnt, False);
LoadAllMacroValues(Path+'MacroValues/', Cnt); LoadAllMacroValues(Path+'MacroValues/', Cnt);
end end
else else
LoadOldFormat(Path); LoadOldFormat(Path);
SetActiveMode(Path); LoadActiveBuildMode(Path);
end; end;
procedure TProjectBuildModes.LoadSessionFromXMLConfig(XMLConfig: TXMLConfig; procedure TProjectBuildModes.LoadSessionFromXMLConfig(XMLConfig: TXMLConfig;
@ -7145,7 +7147,6 @@ procedure TProjectBuildModes.LoadSessionFromXMLConfig(XMLConfig: TXMLConfig;
// Load for session // Load for session
var var
Cnt: Integer; Cnt: Integer;
CurMode: TProjectBuildMode;
begin begin
FXMLConfig := XMLConfig; FXMLConfig := XMLConfig;
@ -7156,10 +7157,7 @@ begin
Cnt:=FXMLConfig.GetValue(Path+'BuildModes/Count',0); Cnt:=FXMLConfig.GetValue(Path+'BuildModes/Count',0);
if Cnt>0 then begin if Cnt>0 then begin
// Add a new mode for session compiler options. // Add a new mode for session compiler options.
CurMode:=Add(FXMLConfig.GetValue(Path+'BuildModes/Item1/Name', '')); LoadOtherCompilerOpts(Path+'BuildModes/', 1, Cnt, True);
CurMode.CompilerOptions.LoadFromXMLConfig(FXMLConfig, 'CompilerOptions/');
CurMode.InSession:=True;
LoadOtherCompilerOpts(Path+'BuildModes/', Cnt, True);
LoadAllMacroValues(Path+'MacroValues/', Cnt); LoadAllMacroValues(Path+'MacroValues/', Cnt);
end; end;
@ -7167,7 +7165,7 @@ begin
// load what matrix options are enabled in session build modes // load what matrix options are enabled in session build modes
LoadSessionEnabledNonSessionMatrixOptions(Path+'BuildModes/SessionEnabledMatrixOptions/'); LoadSessionEnabledNonSessionMatrixOptions(Path+'BuildModes/SessionEnabledMatrixOptions/');
SetActiveMode(Path); LoadActiveBuildMode(Path);
end; end;
// Methods for SaveToXMLConfig // Methods for SaveToXMLConfig
@ -7232,7 +7230,7 @@ begin
Cnt:=0; Cnt:=0;
for i:=0 to Count-1 do for i:=0 to Count-1 do
if Items[i].InSession and SaveSession then if Items[i].InSession and SaveSession then
Items[i].SaveToXMLConfig(FXMLConfig, Path, i=0, Cnt); Items[i].SaveToXMLConfig(FXMLConfig, Path, false, Cnt);
FXMLConfig.SetDeleteValue(Path+'BuildModes/Count',Cnt,0); FXMLConfig.SetDeleteValue(Path+'BuildModes/Count',Cnt,0);
end; end;