STYLE: move the code for writing the initial cache into its own separate
function, makes the long ProcessHandler() a little bit shorter Alex
This commit is contained in:
parent
a605bd5225
commit
46f99c6565
@ -881,22 +881,12 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
|
|||||||
// put the initial cache into the bin dir
|
// put the initial cache into the bin dir
|
||||||
if (!this->InitialCache.empty())
|
if (!this->InitialCache.empty())
|
||||||
{
|
{
|
||||||
std::string cacheFile = this->BinaryDir;
|
if (!this->WriteInitialCache(this->BinaryDir.c_str(),
|
||||||
cacheFile += "/CMakeCache.txt";
|
this->InitialCache.c_str()))
|
||||||
cmGeneratedFileStream fout(cacheFile.c_str());
|
|
||||||
if(!fout)
|
|
||||||
{
|
{
|
||||||
this->RestoreBackupDirectories();
|
this->RestoreBackupDirectories();
|
||||||
return 9;
|
return 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
fout.write(this->InitialCache.c_str(), this->InitialCache.size());
|
|
||||||
|
|
||||||
// Make sure the operating system has finished writing the file
|
|
||||||
// before closing it. This will ensure the file is finished before
|
|
||||||
// the check below.
|
|
||||||
fout.flush();
|
|
||||||
fout.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// do an initial cmake to setup the DartConfig file
|
// do an initial cmake to setup the DartConfig file
|
||||||
@ -995,6 +985,30 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//-------------------------------------------------------------------------
|
||||||
|
bool cmCTestScriptHandler::WriteInitialCache(const char* directory,
|
||||||
|
const char* text)
|
||||||
|
{
|
||||||
|
std::string cacheFile = directory;
|
||||||
|
cacheFile += "/CMakeCache.txt";
|
||||||
|
cmGeneratedFileStream fout(cacheFile.c_str());
|
||||||
|
if(!fout)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text!=0)
|
||||||
|
{
|
||||||
|
fout.write(text, strlen(text));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure the operating system has finished writing the file
|
||||||
|
// before closing it. This will ensure the file is finished before
|
||||||
|
// the check below.
|
||||||
|
fout.flush();
|
||||||
|
fout.close();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
void cmCTestScriptHandler::RestoreBackupDirectories()
|
void cmCTestScriptHandler::RestoreBackupDirectories()
|
||||||
|
@ -90,6 +90,11 @@ public:
|
|||||||
*/
|
*/
|
||||||
static bool EmptyBinaryDirectory(const char *dir);
|
static bool EmptyBinaryDirectory(const char *dir);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Write an initial CMakeCache.txt from the given contents.
|
||||||
|
*/
|
||||||
|
static bool WriteInitialCache(const char* directory, const char* text);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Some elapsed time handling functions
|
* Some elapsed time handling functions
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user