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

IDE: formatting

Browse Source 
git-svn-id: trunk@44023 -
This commit is contained in:
mattias 2014-02-11 23:35:02 +00:00
parent 12933e9214
commit ddbe559512
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/buildlazdialog.pas
View File

@ -916,7 +916,7 @@ end;
destructor TConfigureBuildLazarusDlg.Destroy; destructor TConfigureBuildLazarusDlg.Destroy;
begin begin
fProfiles.Free; FreeAndNil(fProfiles);
inherited Destroy; inherited Destroy;
end; end;

54
ide/main.pp
View File

@ -4562,34 +4562,34 @@ begin
MainBuildBoss.SetBuildTargetIDE; MainBuildBoss.SetBuildTargetIDE;
fBuilder := TLazarusBuilder.Create; // Build profile is not known yet. fBuilder := TLazarusBuilder.Create; // Build profile is not known yet.
try try
try try
DlgResult:=fBuilder.ShowConfigureBuildLazarusDlg(MiscellaneousOptions.BuildLazProfiles); DlgResult:=fBuilder.ShowConfigureBuildLazarusDlg(MiscellaneousOptions.BuildLazProfiles);
finally finally
MainBuildBoss.SetBuildTargetProject1(true); MainBuildBoss.SetBuildTargetProject1(true);
end; end;
if DlgResult in [mrOk,mrYes,mrAll] then begin if DlgResult in [mrOk,mrYes,mrAll] then begin
MiscellaneousOptions.Save; MiscellaneousOptions.Save;
IncreaseCompilerParseStamp; IncreaseCompilerParseStamp;
if DlgResult=mrAll then if DlgResult=mrAll then
DoBuildAdvancedLazarus(MiscellaneousOptions.BuildLazProfiles.Selected) DoBuildAdvancedLazarus(MiscellaneousOptions.BuildLazProfiles.Selected)
else if DlgResult=mrYes then begin else if DlgResult=mrYes then begin
LazSrcTemplate:= LazSrcTemplate:=
CodeToolBoss.DefineTree.FindDefineTemplateByName(StdDefTemplLazarusSources,true); CodeToolBoss.DefineTree.FindDefineTemplateByName(StdDefTemplLazarusSources,true);
if Assigned(LazSrcTemplate) then begin if Assigned(LazSrcTemplate) then begin
LazSrcDirTemplate:=LazSrcTemplate.FindChildByName(StdDefTemplLazarusSrcDir); LazSrcDirTemplate:=LazSrcTemplate.FindChildByName(StdDefTemplLazarusSrcDir);
if Assigned(LazSrcDirTemplate) then begin if Assigned(LazSrcDirTemplate) then begin
CmdLineDefines:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines( CmdLineDefines:=CodeToolBoss.DefinePool.CreateFPCCommandLineDefines(
StdDefTemplLazarusBuildOpts, StdDefTemplLazarusBuildOpts,
MiscellaneousOptions.BuildLazProfiles.Current.ExtraOptions, MiscellaneousOptions.BuildLazProfiles.Current.ExtraOptions,
true,CodeToolsOpts); true,CodeToolsOpts);
CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines, CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines,
StdDefTemplLazarusBuildOpts); StdDefTemplLazarusBuildOpts);
end; end;
end; end;
DoBuildLazarus([]); DoBuildLazarus([]);
end;
end; end;
end;
finally finally
FreeAndNil(fBuilder); FreeAndNil(fBuilder);
end; end;