[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2109-ga5fc93d

[Brad King]

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  a5fc93d6e49fea7f6651885a6ec42ab78ca7ea8c (commit)
       via  c4e6fb6a9d9c74e65f0f01107acc445c18a4b495 (commit)
      from  1537ebe0c16d741b2f7e8a10c5f40799267784ad (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=a5fc93d6e49fea7f6651885a6ec42ab78ca7ea8c
commit a5fc93d6e49fea7f6651885a6ec42ab78ca7ea8c
Merge: 1537ebe c4e6fb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 12 12:12:51 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 12 12:12:51 2013 -0500

    Merge topic 'vs-atomic-generated-stamp' into next
    
    c4e6fb6 Revert "VS: Replace generation timestamp file atomically"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4e6fb6a9d9c74e65f0f01107acc445c18a4b495
commit c4e6fb6a9d9c74e65f0f01107acc445c18a4b495
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 12 12:11:56 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 12 12:12:03 2013 -0500

    Revert "VS: Replace generation timestamp file atomically"
    
    This reverts commit 43a5478d2529918c4defd2bcf20eea2c9fb86dd6.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f65fc22..d57e981 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4033,17 +4033,10 @@ static bool cmakeCheckStampFile(const char* stampName)
     }
 
   // The build system is up to date.  The stamp file has been removed
-  // by the VS IDE due to a "rebuild" request.  Restore it atomically.
-  cmOStringStream stampTempStr;
-  stampTempStr << stampName << ".tmp" << cmSystemTools::RandomSeed();
-  const char* stampTemp = stampTempStr.str().c_str();
-  {
-  // TODO: Teach cmGeneratedFileStream to use a random temp file (with
-  // multiple tries in unlikely case of conflict) and use that here.
-  std::ofstream stamp(stampTemp);
+  // by the VS IDE due to a "rebuild" request.  Just restore it.
+  std::ofstream stamp(stampName);
   stamp << "# CMake generation timestamp file this directory.\n";
-  }
-  if(cmSystemTools::RenameFile(stampTemp, stampName))
+  if(stamp)
     {
     // Notify the user why CMake is not re-running.  It is safe to
     // just print to stdout here because this code is only reachable
@@ -4054,7 +4047,6 @@ static bool cmakeCheckStampFile(const char* stampName)
     }
   else
     {
-    cmSystemTools::RemoveFile(stampTemp);
     cmSystemTools::Error("Cannot restore timestamp ", stampName);
     return false;
     }

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

Summary of changes:
 Source/cmake.cxx |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake