* Fixed compilation check when only build after is used

git-svn-id: trunk@8695 -
This commit is contained in:
marc 2006-02-03 19:30:18 +00:00
parent eac8a11f00
commit 77a5c067c7

View File

@ -7299,8 +7299,10 @@ begin
Result:=DoWarnAmbiguousFiles; Result:=DoWarnAmbiguousFiles;
if Result<>mrOk then exit; if Result<>mrOk then exit;
// check if build is needed // check if build is needed (only if we will call the compiler)
if (pbfOnlyIfNeeded in Flags) and (not (pfAlwaysBuild in Project1.Flags)) if (AReason in Project1.CompilerOptions.CompileReasons)
and (pbfOnlyIfNeeded in Flags)
and (not (pfAlwaysBuild in Project1.Flags))
then begin then begin
Result:=DoCheckIfProjectNeedsCompilation(Project1, Result:=DoCheckIfProjectNeedsCompilation(Project1,
CompilerFilename,CompilerParams, CompilerFilename,CompilerParams,
@ -7348,7 +7350,8 @@ begin
// execute compilation tool 'After' // execute compilation tool 'After'
ToolAfter:=TProjectCompilationToolOptions(Project1.CompilerOptions.ExecuteAfter); ToolAfter:=TProjectCompilationToolOptions(Project1.CompilerOptions.ExecuteAfter);
if (Result = mrOk) and (AReason in ToolAfter.CompileReasons) then begin // no need to check for mrOk, we are exit if it wasn't
if (AReason in ToolAfter.CompileReasons) then begin
Result:=DoExecuteCompilationTool(Project1.CompilerOptions.ExecuteAfter, Result:=DoExecuteCompilationTool(Project1.CompilerOptions.ExecuteAfter,
Project1.ProjectDirectory, Project1.ProjectDirectory,
lisExecutingCommandAfter); lisExecutingCommandAfter);