paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 03:59:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE/lazbuild: append global options to building IDE

Browse Source 
git-svn-id: trunk@48445 -
This commit is contained in:
mattias 2015-03-21 12:11:33 +00:00
parent 2dc3f24423
commit 4a4bc73855
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildlazdialog.pas
View File

@ -58,7 +58,7 @@ uses
// IDE // IDE
LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs, LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs,
MainBar, ExtToolEditDlg, EnvironmentOpts, MainBar, ExtToolEditDlg, EnvironmentOpts,
ApplicationBundle, CompilerOptions, BuildProfileManager, ApplicationBundle, ModeMatrixOpts, CompilerOptions, BuildProfileManager,
GenericListEditor, GenericCheckList, IDECmdLine, PackageSystem, PackageDefs; GenericListEditor, GenericCheckList, IDECmdLine, PackageSystem, PackageDefs;
type type
@ -418,7 +418,6 @@ begin
Result:=mrCancel; Result:=mrCancel;
fProfile:=Profile; fProfile:=Profile;
if CalcTargets(Flags)<>mrOk then exit; if CalcTargets(Flags)<>mrOk then exit;
debugln(['TLazarusBuilder.MakeLazarus AAA1 ',fExtraOptions]);
if LazarusIDE<>nil then if LazarusIDE<>nil then
LazarusIDE.MainBarSubTitle:=Profile.Name; LazarusIDE.MainBarSubTitle:=Profile.Name;
@ -593,6 +592,9 @@ begin
{$ENDIF} {$ENDIF}
AppendExtraOption(fProfile.ExtraOptions,false); AppendExtraOption(fProfile.ExtraOptions,false);
if OnAppendCustomOption<>nil then
OnAppendCustomOption(Self,fExtraOptions,[bmgtEnvironment]);
end; end;
// set target filename and target directory: // set target filename and target directory:

3
ide/buildmanager.pas
View File

@ -2561,7 +2561,8 @@ begin
Result:=BuildMatrixProjectName; Result:=BuildMatrixProjectName;
end else if Sender is TLazPackage then begin end else if Sender is TLazPackage then begin
Result:=TLazPackage(Sender).Name; Result:=TLazPackage(Sender).Name;
end; end else
Result:='#';
//debugln(['TBuildManager.GetModeMatrixTarget ',DbgSName(Sender),' Target="',Result,'"']); //debugln(['TBuildManager.GetModeMatrixTarget ',DbgSName(Sender),' Target="',Result,'"']);
end; end;