[Cmake-commits] CMake branch, next, updated. v2.8.8-2877-gf9bc31f

[Peter Collingbourne]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f9bc31f5fa499b6eec254ef88b2711bf848f425d (commit)
       via  b94514f02018d566abc0156d5a729ebe9ee49105 (commit)
      from  f40b8e5aa3e58d5bda103f220da21360354fc9a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9bc31f5fa499b6eec254ef88b2711bf848f425d
commit f9bc31f5fa499b6eec254ef88b2711bf848f425d
Merge: f40b8e5 b94514f
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Wed May 16 19:06:00 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 16 19:06:00 2012 -0400

    Merge topic 'ninja-error-failbit' into next
    
    b94514f Ninja: mark rules/build file streams failed if error occurred (#13067, #13105)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b94514f02018d566abc0156d5a729ebe9ee49105
commit b94514f02018d566abc0156d5a729ebe9ee49105
Author:     Peter Collingbourne <peter at pcc.me.uk>
AuthorDate: Wed May 16 23:57:09 2012 +0100
Commit:     Peter Collingbourne <peter at pcc.me.uk>
CommitDate: Thu May 17 00:00:16 2012 +0100

    Ninja: mark rules/build file streams failed if error occurred (#13067, #13105)
    
    This causes cmGeneratedFileStream to delete the temporary files,
    rather than overwriting the (working) existing files.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9cbd502..5f52e1d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -385,6 +385,11 @@ void cmGlobalNinjaGenerator::Generate()
   this->WriteTargetAliases(*this->BuildFileStream);
   this->WriteBuiltinTargets(*this->BuildFileStream);
 
+  if (cmSystemTools::GetErrorOccuredFlag()) {
+    this->RulesFileStream->setstate(std::ios_base::failbit);
+    this->BuildFileStream->setstate(std::ios_base::failbit);
+  }
+
   this->CloseRulesFileStream();
   this->CloseBuildFileStream();
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake