IDE: added flag to not compile IDE when just installing a package

git-svn-id: trunk@12698 -
This commit is contained in:
mattias 2007-11-02 16:44:11 +00:00
parent 770d341cc8
commit f97864b493
3 changed files with 13 additions and 4 deletions

View File

@ -72,6 +72,7 @@ type
TMakeModes = set of TMakeMode;
TBuildLazarusFlag = (
blfWithoutCompilingIDE, // skip compiling stage of IDE
blfWithoutLinkingIDE, // skip linking stage of IDE
blfOnlyIDE, // skip all but IDE
blfDontClean, // ignore clean up
@ -360,6 +361,11 @@ var
begin
Result:=mrCancel;
if (blfOnlyIDE in Flags) and (blfWithoutLinkingIDE in Flags)
and (blfWithoutCompilingIDE in Flags) then
exit(mrOk); // only IDE, but skip both parts -> nothing to do
Tool:=TExternalToolOptions.Create;
try
// setup external tool

View File

@ -8623,7 +8623,7 @@ begin
exit;
end;
// then compile the IDE
// then compile the 'installed' packages
if ([blfWithStaticPackages,blfOnlyIDE]*Flags=[])
and (MiscellaneousOptions.BuildLazOpts.ItemIDE.MakeMode=mmNone) then exit;
@ -8680,7 +8680,9 @@ begin
EnvironmentOptions.ExternalTools,GlobalMacroList,
PkgOptions,EnvironmentOptions.CompilerFilename,
EnvironmentOptions.MakeFilename,
IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean]);
IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean,
blfWithoutCompilingIDE]
);
if Result<>mrOk then exit;
finally
@ -8690,7 +8692,7 @@ begin
MessagesView.EndBlock;
end;
if (Result=mrOK) and MiscellaneousOptions.BuildLazOpts.RestartAfterBuild then
mnuRestartClicked(nil);
mnuRestartClicked(nil);
end;
function TMainIDE.DoBuildFile: TModalResult;

View File

@ -493,7 +493,8 @@ begin
SaveAutoInstallDependencies(true);
// save IDE build configs, so user can build IDE on command line
BuildIDEFlags:=[blfWithStaticPackages,blfDontClean,blfOnlyIDE];
BuildIDEFlags:=[blfWithStaticPackages,blfDontClean,blfOnlyIDE,
blfWithoutCompilingIDE];
if MainIDE.DoSaveBuildIDEConfigs(BuildIDEFlags)<>mrOk then exit;
if RebuildIDE then begin