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:
mattias 2008-02-26 15:19:20 +00:00
parent 805b876332
commit c63465bf44
2 changed files with 10 additions and 3 deletions

View File

@ -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;

View File

@ -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;