paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-14 20:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Move func param ExternalTools to a var in TLazarusBuilder.

Browse Source 
git-svn-id: trunk@44045 -
This commit is contained in:
juha 2014-02-13 15:54:02 +00:00
parent 42b052db7b
commit d7ac5727f1
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ide/buildlazdialog.pas
View File

@ -161,19 +161,16 @@ type
fOutputDirRedirected: boolean; fOutputDirRedirected: boolean;
fTargetFilename: string; fTargetFilename: string;
fProfileChanged: boolean; fProfileChanged: boolean;
function CreateIDEMakeOptions(Profile: TBuildLazarusProfile; function CreateIDEMakeOptions(Profile: TBuildLazarusProfile; Flags: TBuildLazarusFlags): TModalResult;
Flags: TBuildLazarusFlags): TModalResult;
function IsWriteProtected(Profile: TBuildLazarusProfile): Boolean; function IsWriteProtected(Profile: TBuildLazarusProfile): Boolean;
public public
{$IFNDEF EnableNewExtTools}
ExternalTools: TBaseExternalToolList;
{$ENDIF}
constructor Create; constructor Create;
function ShowConfigureBuildLazarusDlg(AProfiles: TBuildLazarusProfiles): TModalResult; function ShowConfigureBuildLazarusDlg(AProfiles: TBuildLazarusProfiles): TModalResult;
function MakeLazarus(Profile: TBuildLazarusProfile; Flags: TBuildLazarusFlags): TModalResult;
function MakeLazarus(Profile: TBuildLazarusProfile; function SaveIDEMakeOptions(Profile: TBuildLazarusProfile; Flags: TBuildLazarusFlags): TModalResult;
{$IFNDEF EnableNewExtTools}ExternalTools: TBaseExternalToolList;{$ENDIF}
Flags: TBuildLazarusFlags): TModalResult;
function SaveIDEMakeOptions(Profile: TBuildLazarusProfile;
Flags: TBuildLazarusFlags): TModalResult;
public public
property PackageOptions: string read fPackageOptions write fPackageOptions; property PackageOptions: string read fPackageOptions write fPackageOptions;
property ProfileChanged: boolean read fProfileChanged write fProfileChanged; property ProfileChanged: boolean read fProfileChanged write fProfileChanged;
@ -230,7 +227,6 @@ begin
end; end;
function TLazarusBuilder.MakeLazarus(Profile: TBuildLazarusProfile; function TLazarusBuilder.MakeLazarus(Profile: TBuildLazarusProfile;
{$IFNDEF EnableNewExtTools}ExternalTools: TBaseExternalToolList;{$ENDIF}
Flags: TBuildLazarusFlags): TModalResult; Flags: TBuildLazarusFlags): TModalResult;
procedure ApplyCleanOnce; procedure ApplyCleanOnce;

4
ide/lazbuild.lpr
View File

@ -579,10 +579,11 @@ begin
Builder:=TLazarusBuilder.Create; Builder:=TLazarusBuilder.Create;
try try
Builder.ProfileChanged:=false; Builder.ProfileChanged:=false;
Builder.ExternalTools:=EnvironmentOptions.ExternalTools;
if BuildLazProfiles.Current.IdeBuildMode=bmCleanAllBuild then begin if BuildLazProfiles.Current.IdeBuildMode=bmCleanAllBuild then begin
Builder.PackageOptions:=''; Builder.PackageOptions:='';
CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current, CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current,
EnvironmentOptions.ExternalTools,
Flags+[blfDontBuild]); Flags+[blfDontBuild]);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
if ConsoleVerbosity>=-1 then if ConsoleVerbosity>=-1 then
@ -620,7 +621,6 @@ begin
// compile IDE // compile IDE
CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current, CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current,
EnvironmentOptions.ExternalTools,
Flags+[blfUseMakeIDECfg,blfOnlyIDE]); Flags+[blfUseMakeIDECfg,blfOnlyIDE]);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
if ConsoleVerbosity>=-1 then if ConsoleVerbosity>=-1 then

9
ide/main.pp
View File

@ -7531,6 +7531,7 @@ begin
fBuilder:=TLazarusBuilder.Create; fBuilder:=TLazarusBuilder.Create;
{$IFNDEF EnableNewExtTools} {$IFNDEF EnableNewExtTools}
MessagesView.BeginBlock; MessagesView.BeginBlock;
fBuilder.ExternalTools:=ExternalTools;
{$ENDIF} {$ENDIF}
fBuilder.ProfileChanged:=false; fBuilder.ProfileChanged:=false;
with MiscellaneousOptions do with MiscellaneousOptions do
@ -7545,9 +7546,7 @@ begin
if BuildLazProfiles.Current.IdeBuildMode=bmCleanAllBuild then begin if BuildLazProfiles.Current.IdeBuildMode=bmCleanAllBuild then begin
SourceEditorManager.ClearErrorLines; SourceEditorManager.ClearErrorLines;
fBuilder.PackageOptions:=''; fBuilder.PackageOptions:='';
Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current, Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current, [blfDontBuild]);
{$IFNDEF EnableNewExtTools}ExternalTools,{$ENDIF}
[blfDontBuild]);
if Result<>mrOk then begin if Result<>mrOk then begin
DebugLn('TMainIDE.DoBuildLazarus: Clean all failed.'); DebugLn('TMainIDE.DoBuildLazarus: Clean all failed.');
exit; exit;
@ -7598,9 +7597,7 @@ begin
// make lazarus ide // make lazarus ide
SourceEditorManager.ClearErrorLines; SourceEditorManager.ClearErrorLines;
IDEBuildFlags:=IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean]; IDEBuildFlags:=IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean];
Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current, Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current, IDEBuildFlags);
{$IFNDEF EnableNewExtTools}ExternalTools,{$ENDIF}
IDEBuildFlags);
if Result<>mrOk then exit; if Result<>mrOk then exit;
if fBuilder.ProfileChanged then if fBuilder.ProfileChanged then