IDE: clean up

git-svn-id: trunk@46250 -
This commit is contained in:
mattias 2014-09-19 09:46:15 +00:00
parent c70388e6a8
commit 39fbd66aec
2 changed files with 15 additions and 17 deletions

View File

@ -52,7 +52,6 @@
<Unit1>
<Filename Value="buildmanager.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="BuildManager"/>
</Unit1>
<Unit2>
<Filename Value="basebuildmanager.pas"/>

View File

@ -782,6 +782,7 @@ type
Flags: TProjectBuildFlags): TModalResult; override;
function UpdateProjectPOFile(AProject: TProject): TModalResult;
function DoAbortBuild: TModalResult;
procedure DoCompile;
procedure DoQuickCompile;
function DoInitProjectRun: TModalResult; override;
function DoRunProject: TModalResult;
@ -3254,13 +3255,7 @@ begin
ecSaveAll: DoSaveAll([sfCheckAmbiguousFiles]);
ecQuit: mnuQuitClicked(Self);
ecCompile:
begin
GetCurrentUnit(ASrcEdit,AnUnitInfo);
if Assigned(AnUnitInfo) and AnUnitInfo.BuildFileIfActive then
DoBuildFile(false)
else
DoBuildProject(crCompile, []);
end;
DoCompile;
ecRun:
begin
GetCurrentUnit(ASrcEdit,AnUnitInfo);
@ -4266,16 +4261,8 @@ begin
end;
procedure TMainIDE.mnuCompileProjectClicked(Sender: TObject);
var
ASrcEdit: TSourceEditor;
AnUnitInfo: TUnitInfo;
Begin
GetCurrentUnit(ASrcEdit,AnUnitInfo);
if (AnUnitInfo<>nil)
and AnUnitInfo.BuildFileIfActive then
DoBuildFile(false)
else
DoBuildProject(crCompile,[]);
DoCompile;
end;
procedure TMainIDE.mnuBuildProjectClicked(Sender: TObject);
@ -6765,6 +6752,18 @@ begin
AbortBuild;
end;
procedure TMainIDE.DoCompile;
var
ASrcEdit: TSourceEditor;
AnUnitInfo: TUnitInfo;
begin
GetCurrentUnit(ASrcEdit,AnUnitInfo);
if Assigned(AnUnitInfo) and AnUnitInfo.BuildFileIfActive then
DoBuildFile(false)
else
DoBuildProject(crCompile, []);
end;
procedure TMainIDE.DoQuickCompile;
begin
DoBuildProject(crCompile,[pbfSkipLinking,pbfSkipTools,pbfSkipAssembler]);