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

better configure file command

Browse Source
This commit is contained in:
Ken Martin 2001-06-29 16:46:28 -04:00
parent 51a8914630
commit 901d2626ce
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmConfigureFileCommand.cxx
View File

@ -81,13 +81,6 @@ void cmConfigureFileCommand::FinalPass()
{
m_Makefile->ExpandVariablesInString(m_InputFile);
m_Makefile->ExpandVariablesInString(m_OuputFile);
std::ifstream fin(m_InputFile.c_str());
if(!fin)
{
cmSystemTools::Error("Could not open file for read in copy operatation",
m_InputFile.c_str());
return;
}
cmSystemTools::ConvertToUnixSlashes(m_OuputFile);
std::string::size_type pos = m_OuputFile.rfind('/');
if(pos != std::string::npos)
@ -95,6 +88,14 @@ void cmConfigureFileCommand::FinalPass()
std::string path = m_OuputFile.substr(0, pos);
cmSystemTools::MakeDirectory(path.c_str());
}
if(m_CopyOnly)
{
cmSystemTools::CopyFileIfDifferent(m_InputFile.c_str(),
m_OuputFile.c_str());
}
else
{
std::string tempOutputFile = m_OuputFile;
tempOutputFile += ".tmp";
std::ofstream fout(tempOutputFile.c_str());
@ -104,6 +105,14 @@ void cmConfigureFileCommand::FinalPass()
tempOutputFile.c_str());
return;
}
std::ifstream fin(m_InputFile.c_str());
if(!fin)
{
cmSystemTools::Error("Could not open file for read in copy operatation",
m_InputFile.c_str());
return;
}
// now copy input to output and expand varibles in the
// input file at the same time
const int bufSize = 4096;
@ -116,8 +125,6 @@ void cmConfigureFileCommand::FinalPass()
if(fin)
{
inLine = buffer;
if(!m_CopyOnly)
{
m_Makefile->ExpandVariablesInString(inLine, m_EscapeQuotes);
m_Makefile->RemoveVariablesInString(inLine);
// look for special cmakedefine symbol and handle it
@ -139,7 +146,6 @@ void cmConfigureFileCommand::FinalPass()
}
fout << inLine << "\n";
}
}
// close the files before attempting to copy
fin.close();
fout.close();
@ -147,5 +153,6 @@ void cmConfigureFileCommand::FinalPass()
m_OuputFile.c_str());
cmSystemTools::RemoveFile(tempOutputFile.c_str());
}
}