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

IDE: Remove func params CompilerPath and MakePath in TLazarusBuilder and use EnvironmentOptions values instead.

Browse Source 
git-svn-id: trunk@44044 -
This commit is contained in:
juha 2014-02-13 15:53:52 +00:00
parent 8bc5a5ae99
commit 42b052db7b
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ide/buildlazdialog.pas
View File

@ -170,7 +170,7 @@ type
function MakeLazarus(Profile: TBuildLazarusProfile; function MakeLazarus(Profile: TBuildLazarusProfile;
{$IFNDEF EnableNewExtTools}ExternalTools: TBaseExternalToolList;{$ENDIF} {$IFNDEF EnableNewExtTools}ExternalTools: TBaseExternalToolList;{$ENDIF}
const CompilerPath, MakePath: string; Flags: TBuildLazarusFlags): TModalResult; Flags: TBuildLazarusFlags): TModalResult;
function SaveIDEMakeOptions(Profile: TBuildLazarusProfile; function SaveIDEMakeOptions(Profile: TBuildLazarusProfile;
Flags: TBuildLazarusFlags): TModalResult; Flags: TBuildLazarusFlags): TModalResult;
@ -231,7 +231,7 @@ end;
function TLazarusBuilder.MakeLazarus(Profile: TBuildLazarusProfile; function TLazarusBuilder.MakeLazarus(Profile: TBuildLazarusProfile;
{$IFNDEF EnableNewExtTools}ExternalTools: TBaseExternalToolList;{$ENDIF} {$IFNDEF EnableNewExtTools}ExternalTools: TBaseExternalToolList;{$ENDIF}
const CompilerPath, MakePath: string; Flags: TBuildLazarusFlags): TModalResult; Flags: TBuildLazarusFlags): TModalResult;
procedure ApplyCleanOnce; procedure ApplyCleanOnce;
begin begin
@ -387,13 +387,13 @@ begin
Tool:=nil; Tool:=nil;
try try
// setup external tool // setup external tool
EnvironmentOverrides.Values['LCL_PLATFORM']:= EnvironmentOverrides.Values['LCL_PLATFORM']:=LCLPlatformDirNames[Profile.TargetPlatform];
LCLPlatformDirNames[Profile.TargetPlatform];
EnvironmentOverrides.Values['LANG']:= 'en_US'; EnvironmentOverrides.Values['LANG']:= 'en_US';
if CompilerPath<>'' then Dir:=EnvironmentOptions.GetParsedCompilerFilename;
EnvironmentOverrides.Values['PP']:=CompilerPath; if Dir<>'' then
EnvironmentOverrides.Values['PP']:=Dir;
Executable:=MakePath; Executable:=EnvironmentOptions.GetParsedMakeFilename;
if (Executable<>'') and (not FileExistsUTF8(Executable)) then if (Executable<>'') and (not FileExistsUTF8(Executable)) then
Executable:=FindDefaultExecutablePath(Executable); Executable:=FindDefaultExecutablePath(Executable);
if (Executable='') or (not FileExistsUTF8(Executable)) then begin if (Executable='') or (not FileExistsUTF8(Executable)) then begin

4
ide/lazbuild.lpr
View File

@ -583,8 +583,6 @@ begin
Builder.PackageOptions:=''; Builder.PackageOptions:='';
CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current, CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current,
EnvironmentOptions.ExternalTools, EnvironmentOptions.ExternalTools,
EnvironmentOptions.GetParsedCompilerFilename,
EnvironmentOptions.GetParsedMakeFilename,
Flags+[blfDontBuild]); Flags+[blfDontBuild]);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
if ConsoleVerbosity>=-1 then if ConsoleVerbosity>=-1 then
@ -623,8 +621,6 @@ begin
// compile IDE // compile IDE
CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current, CurResult:=Builder.MakeLazarus(BuildLazProfiles.Current,
EnvironmentOptions.ExternalTools, EnvironmentOptions.ExternalTools,
EnvironmentOptions.GetParsedCompilerFilename,
EnvironmentOptions.GetParsedMakeFilename,
Flags+[blfUseMakeIDECfg,blfOnlyIDE]); Flags+[blfUseMakeIDECfg,blfOnlyIDE]);
if CurResult<>mrOk then begin if CurResult<>mrOk then begin
if ConsoleVerbosity>=-1 then if ConsoleVerbosity>=-1 then

6
ide/main.pp
View File

@ -7547,8 +7547,7 @@ begin
fBuilder.PackageOptions:=''; fBuilder.PackageOptions:='';
Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current, Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current,
{$IFNDEF EnableNewExtTools}ExternalTools,{$ENDIF} {$IFNDEF EnableNewExtTools}ExternalTools,{$ENDIF}
EnvironmentOptions.GetParsedCompilerFilename, [blfDontBuild]);
EnvironmentOptions.GetParsedMakeFilename, [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;
@ -7601,8 +7600,7 @@ begin
IDEBuildFlags:=IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean]; IDEBuildFlags:=IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean];
Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current, Result:=fBuilder.MakeLazarus(BuildLazProfiles.Current,
{$IFNDEF EnableNewExtTools}ExternalTools,{$ENDIF} {$IFNDEF EnableNewExtTools}ExternalTools,{$ENDIF}
EnvironmentOptions.GetParsedCompilerFilename, IDEBuildFlags);
EnvironmentOptions.GetParsedMakeFilename,IDEBuildFlags);
if Result<>mrOk then exit; if Result<>mrOk then exit;
if fBuilder.ProfileChanged then if fBuilder.ProfileChanged then