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

ENH: another fix for the deb generator by Mathieu

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2007-08-06 13:31:37 -04:00
parent e41e2e6b1a
commit f23169b01a
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -126,7 +126,8 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
topLevelWithTrailingSlash.c_str(), ""); topLevelWithTrailingSlash.c_str(), "");
out << output; out << output;
} }
out << std::endl; // each line contains a eol.
// Do not end the md5sum file with yet another (invalid)
} }
@ -157,6 +158,20 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
&retVal, toplevel, this->GeneratorVerbose, 0); &retVal, toplevel, this->GeneratorVerbose, 0);
if ( !res || retVal )
{
std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
tmpFile += "/Deb.log";
cmGeneratedFileStream ofs(tmpFile.c_str());
ofs << "# Run command: " << cmd.c_str() << std::endl
<< "# Output:" << std::endl
<< output.c_str() << std::endl;
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running ar command: "
<< cmd.c_str() << std::endl
<< "Please check " << tmpFile.c_str() << " for errors" << std::endl);
return 0;
}
return 1; return 1;
} }