paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 10:19:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: clean up

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/lazbuild.lpi
View File

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

31
ide/main.pp
View File

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