reactos/ninja
1
0
Fork 0
mirror of https://github.com/reactos/ninja.git synced 2024-11-27 13:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Close BuildLog while running generators, fix #1724

Browse Source 
While #1780 delayed opening .ninja_log until the first write, this
this didn't fully fix the issue on Windows: There might be build
statements which run before the generator resulting in an actual write
to .ninja_log.

To fix this once and for all the BuildLog now gets closed before running
the generator. BuildLog::log_file_path_ won't be cleared so that it can
be opened again after the generator finished.
This commit is contained in:
Jan Niklas Hasse 2020-08-26 12:07:25 +02:00
parent 9ddd3c9177
commit b0b26cc9c4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build.cc
View File

@ -829,6 +829,10 @@ bool Builder::Build(string* err) {
// See if we can start any more commands.
if (failures_allowed && command_runner_->CanRunMore()) {
if (Edge* edge = plan_.FindWork()) {
if (edge->GetBindingBool("generator")) {
scan_.build_log()->Close();
}
if (!StartEdge(edge, err)) {
Cleanup();
status_->BuildFinished();

3
src/build_log.cc
View File

@ -181,7 +181,7 @@ void BuildLog::Close() {
}
bool BuildLog::OpenForWriteIfNeeded() {
if (log_file_path_.empty()) {
if (log_file_ || log_file_path_.empty()) {
return true;
}
log_file_ = fopen(log_file_path_.c_str(), "ab");
@ -200,7 +200,6 @@ bool BuildLog::OpenForWriteIfNeeded() {
return false;
}
}
log_file_path_.clear();
return true;
}