fixed building IDE clean

git-svn-id: trunk@4740 -
This commit is contained in:
mattias 2003-10-30 20:15:45 +00:00
parent 7617ce320f
commit 550f21ae57
2 changed files with 14 additions and 7 deletions

View File

@ -62,7 +62,8 @@ type
blfOnlyIDE,
blfQuick,
blfWithStaticPackages,
blfUseMakeIDECfg
blfUseMakeIDECfg,
blfDontClean
);
TBuildLazarusFlags = set of TBuildLazarusFlag;
@ -320,19 +321,22 @@ begin
CurItem:=Options.Items[i];
// calculate make mode
CurMakeMode:=CurItem.MakeMode;
if (blfOnlyIDE in Flags) then
if (CurItem=Options.ItemIDE) then
CurMakeMode:=mmCleanBuild
else
if (blfOnlyIDE in Flags) then begin
if (CurItem=Options.ItemIDE) then begin
CurMakeMode:=mmCleanBuild;
end else
CurMakeMode:=mmNone;
end;
if (blfQuick in Flags) and (CurMakeMode=mmCleanBuild) then
CurMakeMode:=mmBuild;
if CurMakeMode=mmNone then continue;
if (CurMakeMode=mmCleanBuild) and (blfDontClean in Flags) then
CurMakeMode:=mmBuild;
Tool.Title:=CurItem.Description;
if (CurItem=Options.ItemIDE) and (blfWithoutLinkingIDE in Flags) then
Tool.Title:=lisCompileIDEWithoutLinking;
Tool.WorkingDirectory:='$(LazarusDir)/'+CurItem.Directory;
Tool.CmdLineParams:=CurItem.Commands[CurItem.MakeMode];
Tool.CmdLineParams:=CurItem.Commands[CurMakeMode];
// append extra options
ExtraOptions:='';
Result:=CreateBuildLazarusOptions(Options,i,Macros,PackageOptions,Flags,

View File

@ -5901,7 +5901,7 @@ begin
SourceNotebook.ClearErrorLines;
Result:=BuildLazarus(MiscellaneousOptions.BuildLazOpts,
EnvironmentOptions.ExternalTools,MacroList,
PkgOptions,IDEBuildFlags+[blfUseMakeIDECfg]);
PkgOptions,IDEBuildFlags+[blfUseMakeIDECfg,blfDontClean]);
if Result<>mrOk then exit;
finally
DoCheckFilesOnDisk;
@ -9926,6 +9926,9 @@ end.
{ =============================================================================
$Log$
Revision 1.661 2003/10/30 20:15:45 mattias
fixed building IDE clean
Revision 1.660 2003/10/28 14:25:37 mattias
fixed unit circle