mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-12-16 01:40:37 +01:00
IDE: combined compiling+linking IDE steps to one step again. IDE packages must now use the IDEIntf only.
git-svn-id: trunk@14261 -
This commit is contained in:
parent
805b876332
commit
c63465bf44
@ -416,7 +416,14 @@ begin
|
||||
end else
|
||||
CurMakeMode:=mmNone;
|
||||
end;
|
||||
if (CurItem=Options.ItemIDE)
|
||||
and (blfWithoutCompilingIDE in Flags)
|
||||
and (blfWithoutLinkingIDE in Flags)
|
||||
then
|
||||
CurMakeMode:=mmNone;
|
||||
|
||||
if CurMakeMode=mmNone then continue;
|
||||
|
||||
if (blfDontClean in Flags) and (CurMakeMode=mmCleanBuild) then
|
||||
CurMakeMode:=mmBuild;
|
||||
Tool.Title:=CurItem.Description;
|
||||
|
||||
@ -8914,12 +8914,13 @@ begin
|
||||
MainBuildBoss.SetBuildTargetIDE;
|
||||
|
||||
// first compile all lazarus components (LCL, SynEdit, CodeTools, ...)
|
||||
// but not the IDE
|
||||
SourceNotebook.ClearErrorLines;
|
||||
Result:=BuildLazarus(MiscellaneousOptions.BuildLazOpts,
|
||||
EnvironmentOptions.ExternalTools,GlobalMacroList,
|
||||
'',EnvironmentOptions.CompilerFilename,
|
||||
EnvironmentOptions.MakeFilename,
|
||||
Flags+[blfWithoutLinkingIDE]);
|
||||
Flags+[blfWithoutCompilingIDE,blfWithoutLinkingIDE]);
|
||||
if Result<>mrOk then begin
|
||||
DebugLn('TMainIDE.DoBuildLazarus: Build Lazarus without linking failed.');
|
||||
exit;
|
||||
@ -8982,8 +8983,7 @@ begin
|
||||
EnvironmentOptions.ExternalTools,GlobalMacroList,
|
||||
PkgOptions,EnvironmentOptions.CompilerFilename,
|
||||
EnvironmentOptions.MakeFilename,
|
||||
IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean,
|
||||
blfWithoutCompilingIDE]
|
||||
IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean]
|
||||
);
|
||||
if Result<>mrOk then exit;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user