paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 11:30:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Set return value for TMainIDE.DoBuildLazarusAll. Remove temporary exceptions.

Browse Source 
git-svn-id: trunk@28020 -
This commit is contained in:
juha 2010-11-01 07:46:50 +00:00
parent 0b17ddcdc6
commit 73922ebfe5
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ide/main.pp
View File

@ -11521,11 +11521,11 @@ var
CmdLineDefines: TDefineTemplate; CmdLineDefines: TDefineTemplate;
LazSrcTemplate: TDefineTemplate; LazSrcTemplate: TDefineTemplate;
LazSrcDirTemplate: TDefineTemplate; LazSrcDirTemplate: TDefineTemplate;
BuildResult: TModalResult;
i, RealCurInd: Integer; i, RealCurInd: Integer;
MayNeedRestart, FoundProfToBuild: Boolean; MayNeedRestart, FoundProfToBuild: Boolean;
s: String; s: String;
begin begin
Result:=mrOK;
with MiscellaneousOptions do begin with MiscellaneousOptions do begin
MayNeedRestart:=False; MayNeedRestart:=False;
RealCurInd:=BuildLazProfiles.CurrentIndex; RealCurInd:=BuildLazProfiles.CurrentIndex;
@ -11559,20 +11559,15 @@ begin
BuildLazProfiles.Current.ExOptions,true,CodeToolsOpts); BuildLazProfiles.Current.ExOptions,true,CodeToolsOpts);
CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines, CodeToolBoss.DefineTree.ReplaceChild(LazSrcDirTemplate,CmdLineDefines,
StdDefTemplLazarusBuildOpts); StdDefTemplLazarusBuildOpts);
end end;
else // Temporary exceptions to find an error. end;
raise Exception.Create('LazSrcTemplate.FindChildByName(StdDefTemplLazarusSrcDir)' Result:=DoBuildLazarusSub([]);
+' returned Nil for profile '+BuildLazProfiles.Current.Name); if Result=mrOK then
end
else
raise Exception.Create('CodeToolBoss.DefineTree.FindDefineTemplateByName('
+'StdDefTemplLazarusSources,true) returned Nil for profile '
+BuildLazProfiles.Current.Name);
BuildResult:=DoBuildLazarusSub([]);
if BuildResult=mrOK then
MayNeedRestart:=True MayNeedRestart:=True
else if Result=mrIgnore then
Result:=mrOK
else else
if BuildResult<>mrIgnore then exit; exit;
end; end;
end; end;
finally finally