kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs-atomic-generated-stamp' 

2dc17f8 VS: Replace generation timestamp file atomically
This commit is contained in:
Brad King 2013-02-15 13:13:14 -05:00 committed by CMake Topic Stage
parent e85f1c28d4 2dc17f88dd
commit 5698d9b865
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmake.cxx
View File

@ -4033,10 +4033,18 @@ 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. Just restore it.
std::ofstream stamp(stampName);
// by the VS IDE due to a "rebuild" request. Restore it atomically.
cmOStringStream stampTempStream;
stampTempStream << stampName << ".tmp" << cmSystemTools::RandomSeed();
std::string stampTempString = stampTempStream.str();
const char* stampTemp = stampTempString.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);
stamp << "# CMake generation timestamp file this directory.\n";
if(stamp)
}
if(cmSystemTools::RenameFile(stampTemp, stampName))
{
// Notify the user why CMake is not re-running. It is safe to
// just print to stdout here because this code is only reachable
@ -4047,6 +4055,7 @@ static bool cmakeCheckStampFile(const char* stampName)
}
else
{
cmSystemTools::RemoveFile(stampTemp);
cmSystemTools::Error("Cannot restore timestamp ", stampName);
return false;
}