paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 17:58:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Fix Before-tool execution, simplify project build. Issue #29773, patch from Martok.

Browse Source 
git-svn-id: trunk@51874 -
This commit is contained in:
juha 2016-03-09 12:02:07 +00:00
parent 1845a2deef
commit 7b55f8c8e6
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/lazideintf.pas
View File

@ -142,11 +142,9 @@ type
// build project flags
// Normally you don't need to pass any flags.
TProjectBuildFlag = (
pbfCleanCompile, // append -B to the compiler options
pbfDoNotCompileDependencies,
pbfDoNotCompileProject,
pbfCompileDependenciesClean,
pbfOnlyIfNeeded,
pbfDoNotSaveEditorFiles,
pbfSkipLinking,
pbfSkipAssembler,

10
components/projectgroups/projectgroup.pp
View File

@ -1324,7 +1324,7 @@ end;
function TIDECompileTarget.ProjectAction(AAction: TPGTargetAction;
StartBuildMode: string): TPGActionResult;
var
F: TProjectBuildFlags;
R: TCompileReason;
i: Integer;
aMode: TPGBuildMode;
aProject: TLazProject;
@ -1361,9 +1361,9 @@ begin
// save project
if LazarusIDE.DoSaveProject([])<>mrOk then exit;
F:=[];
R:= crCompile;
if (AAction=taCompileClean) then
Include(F,pbfCleanCompile);
R:= crBuild;
if BuildModeCount>1 then begin
i:=0;
if StartBuildMode<>'' then begin
@ -1383,7 +1383,7 @@ begin
exit;
end;
// compile project in active buildmode
if LazarusIDE.DoBuildProject(crCompile,F)<>mrOk then
if LazarusIDE.DoBuildProject(R,[])<>mrOk then
exit;
if (StartBuildMode<>'') and (AAction<>taCompileFromHere) then
exit(arOK);
@ -1391,7 +1391,7 @@ begin
end;
end else begin
// compile default buildmode
if LazarusIDE.DoBuildProject(crCompile,F)<>mrOk then
if LazarusIDE.DoBuildProject(R,[])<>mrOk then
exit;
end;
Result:=arOK;

54
ide/main.pp
View File

@ -3248,7 +3248,7 @@ begin
end;
end;
ecDetach: DebugBoss.Detach;
ecBuild: DoBuildProject(crBuild, [pbfCleanCompile]);
ecBuild: DoBuildProject(crBuild, []);
ecCleanUpAndBuild: mnuCleanUpAndBuildProjectClicked(nil);
ecQuickCompile: DoQuickCompile;
ecAbortBuild: DoAbortBuild(false);
@ -4166,7 +4166,7 @@ end;
procedure TMainIDE.mnuBuildProjectClicked(Sender: TObject);
Begin
DoBuildProject(crBuild,[pbfCleanCompile]);
DoBuildProject(crBuild,[]);
end;
procedure TMainIDE.mnuQuickCompileProjectClicked(Sender: TObject);
@ -6446,6 +6446,7 @@ var
WorkingDir: String;
CompilerParams: String;
NeedBuildAllFlag: Boolean;
NoBuildNeeded: Boolean;
UnitOutputDirectory: String;
TargetExeName: String;
TargetExeDirectory: String;
@ -6557,17 +6558,20 @@ begin
// check if build is needed (only if we will call the compiler)
// and check if a 'build all' is needed
NeedBuildAllFlag:=false;
NoBuildNeeded:= false;
aCompileHint:='';
if (AReason in Project1.CompilerOptions.CompileReasons) then begin
Result:=MainBuildBoss.DoCheckIfProjectNeedsCompilation(Project1,
NeedBuildAllFlag,aCompileHint);
if (pbfOnlyIfNeeded in Flags)
if (AReason = crRun)
and (not (pfAlwaysBuild in Project1.Flags)) then begin
if Result=mrNo then begin
debugln(['Error: (lazarus) [TMainIDE.DoBuildProject] MainBuildBoss.DoCheckIfProjectNeedsCompilation nothing to be done']);
Result:=mrOk;
exit;
end;
// continue for now, check if 'Before' tool is required
NoBuildNeeded:= true;
end
else
if Result<>mrYes then
begin
debugln(['Error: (lazarus) [TMainIDE.DoBuildProject] MainBuildBoss.DoCheckIfProjectNeedsCompilation failed']);
@ -6578,6 +6582,26 @@ begin
if aCompileHint<>'' then
aCompileHint:='Compile Reason: '+aCompileHint;
// execute compilation tool 'Before'
if not (pbfSkipTools in Flags) then begin
ToolBefore:=TProjectCompilationToolOptions(
Project1.CompilerOptions.ExecuteBefore);
if (AReason in ToolBefore.CompileReasons) then begin
Result:=Project1.CompilerOptions.ExecuteBefore.Execute(
Project1.ProjectDirectory, lisProject2+lisExecutingCommandBefore,
aCompileHint);
if Result<>mrOk then
begin
debugln(['Error: (lazarus) [TMainIDE.DoBuildProject] CompilerOptions.ExecuteBefore.Execute failed']);
exit;
end;
end;
end;
// leave if no further action is needed
if NoBuildNeeded then
exit;
// create unit output directory
UnitOutputDirectory:=Project1.CompilerOptions.GetUnitOutPath(false);
if Project1.IsVirtual and (not FilenameIsAbsolute(UnitOutputDirectory)) then
@ -6638,22 +6662,6 @@ begin
exit;
end;
// execute compilation tool 'Before'
if not (pbfSkipTools in Flags) then begin
ToolBefore:=TProjectCompilationToolOptions(
Project1.CompilerOptions.ExecuteBefore);
if (AReason in ToolBefore.CompileReasons) then begin
Result:=Project1.CompilerOptions.ExecuteBefore.Execute(
Project1.ProjectDirectory, lisProject2+lisExecutingCommandBefore,
aCompileHint);
if Result<>mrOk then
begin
debugln(['Error: (lazarus) [TMainIDE.DoBuildProject] CompilerOptions.ExecuteBefore.Execute failed']);
exit;
end;
end;
end;
if (AReason in Project1.CompilerOptions.CompileReasons)
and (not (pbfDoNotCompileProject in Flags)) then begin
try
@ -6678,7 +6686,7 @@ begin
StartTime:=Now;
Result:=TheCompiler.Compile(Project1,
WorkingDir,CompilerFilename,CompilerParams,
(pbfCleanCompile in Flags) or NeedBuildAllFlag,
(AReason = crBuild) or NeedBuildAllFlag,
pbfSkipLinking in Flags,
pbfSkipAssembler in Flags,aCompileHint);
if ConsoleVerbosity>=0 then
@ -6830,7 +6838,7 @@ begin
// Build project first
if ConsoleVerbosity>0 then
debugln('Hint: (lazarus) TMainIDE.DoInitProjectRun Check build ...');
if DoBuildProject(crRun,[pbfOnlyIfNeeded]) <> mrOk then
if DoBuildProject(crRun,[]) <> mrOk then
Exit;
// Check project build