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

STYLE: Fix style problems

This commit is contained in:
Andy Cedilnik 2006-03-09 08:32:08 -05:00
parent 8c11d31cc3
commit 95ea0272de
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/CPack/cmCPackGenericGenerator.cxx
View File

@ -148,7 +148,8 @@ int cmCPackGenericGenerator::InstallProject()
std::vector<std::string> installCommandsVector; std::vector<std::string> installCommandsVector;
cmSystemTools::ExpandListArgument(installCommands,installCommandsVector); cmSystemTools::ExpandListArgument(installCommands,installCommandsVector);
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
for ( it = installCommandsVector.begin(); it != installCommandsVector.end(); for ( it = installCommandsVector.begin();
it != installCommandsVector.end();
++it ) ++it )
{ {
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << it->c_str() cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << it->c_str()
@ -167,7 +168,8 @@ int cmCPackGenericGenerator::InstallProject()
<< output.c_str() << std::endl; << output.c_str() << std::endl;
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Problem running install command: " << it->c_str() << std::endl "Problem running install command: " << it->c_str() << std::endl
<< "Please check " << tmpFile.c_str() << " for errors" << std::endl); << "Please check " << tmpFile.c_str() << " for errors"
<< std::endl);
res = 0; res = 0;
break; break;
} }
@ -184,8 +186,8 @@ int cmCPackGenericGenerator::InstallProject()
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"CPACK_INSTALLED_DIRECTORIES should contain pairs of <directory> and " "CPACK_INSTALLED_DIRECTORIES should contain pairs of <directory> and "
"<subdirectory>. The <subdirectory> can be '.' to be installed in the " "<subdirectory>. The <subdirectory> can be '.' to be installed in "
"toplevel directory of installation." << std::endl); "the toplevel directory of installation." << std::endl);
return 0; return 0;
} }
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;

3
Source/CPack/cmCPackPackageMakerGenerator.cxx
View File

@ -181,7 +181,8 @@ int cmCPackPackageMakerGenerator::Initialize(const char* name, cmMakefile* mf)
"version file" << std::endl); "version file" << std::endl);
return 0; return 0;
} }
if ( !cmSystemTools::GetLineFromStream(ifs, line) || !rexVersion.find(line) ) if ( !cmSystemTools::GetLineFromStream(ifs, line) ||
!rexVersion.find(line) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Problem reading the PackageMaker compiler version file: " "Problem reading the PackageMaker compiler version file: "

30
Source/CPack/cpack.cxx
View File

@ -42,7 +42,8 @@ static const cmDocumentationEntry cmDocumentationName[] =
static const cmDocumentationEntry cmDocumentationUsage[] = static const cmDocumentationEntry cmDocumentationUsage[] =
{ {
{0, {0,
" cpack -G <generator> -P <ProjectName> -R <ReleaseVersion> [options]", 0}, " cpack -G <generator> -P <ProjectName> -R <ReleaseVersion> [options]",
0},
{0,0,0} {0,0,0}
}; };
@ -62,16 +63,16 @@ static const cmDocumentationEntry cmDocumentationDescription[] =
static const cmDocumentationEntry cmDocumentationOptions[] = static const cmDocumentationEntry cmDocumentationOptions[] =
{ {
{"-G <generator>", "Use the specified generator to generate package.", {"-G <generator>", "Use the specified generator to generate package.",
"CPack may support multiple native packaging systems on certain platforms." "CPack may support multiple native packaging systems on certain "
"A generator is responsible for generating input files for particular " "platforms. A generator is responsible for generating input files for "
"system and invoking that systems. Possible generator names are " "particular system and invoking that systems. Possible generator names "
"specified in the Generators section." }, "are specified in the Generators section." },
{"-P <ProjectName>", "Specify the project name.", {"-P <ProjectName>", "Specify the project name.",
"This option specifies the project name that will be used to generate the " "This option specifies the project name that will be used to generate "
"installer." }, "the installer." },
{"-C <Configuration>", "Specify the project configuration", {"-C <Configuration>", "Specify the project configuration",
"This option specifies the configuration that the project was build with, " "This option specifies the configuration that the project was build "
"for example 'Debug', 'Release'." }, "with, for example 'Debug', 'Release'." },
{"-R <ReleaseVersion>", "Specify the release version of the project.", {"-R <ReleaseVersion>", "Specify the release version of the project.",
"This option specifies the release version of the project that will be " "This option specifies the release version of the project that will be "
"used by installer." }, "used by installer." },
@ -177,8 +178,10 @@ int main (int argc, char *argv[])
typedef cmsys::CommandLineArguments argT; typedef cmsys::CommandLineArguments argT;
// Help arguments // Help arguments
arg.AddArgument("--help", argT::NO_ARGUMENT, &help, "CPack help"); arg.AddArgument("--help", argT::NO_ARGUMENT, &help, "CPack help");
arg.AddArgument("--help-full", argT::SPACE_ARGUMENT, &helpFull, "CPack help"); arg.AddArgument("--help-full", argT::SPACE_ARGUMENT, &helpFull,
arg.AddArgument("--help-html", argT::SPACE_ARGUMENT, &helpHTML, "CPack help"); "CPack help");
arg.AddArgument("--help-html", argT::SPACE_ARGUMENT, &helpHTML,
"CPack help");
arg.AddArgument("--help-man", argT::SPACE_ARGUMENT, &helpMAN, "CPack help"); arg.AddArgument("--help-man", argT::SPACE_ARGUMENT, &helpMAN, "CPack help");
arg.AddArgument("--version", argT::NO_ARGUMENT, &helpVersion, "CPack help"); arg.AddArgument("--version", argT::NO_ARGUMENT, &helpVersion, "CPack help");
@ -358,8 +361,9 @@ int main (int argc, char *argv[])
"Cannot find installation file: " << makeInstallFile.c_str() "Cannot find installation file: " << makeInstallFile.c_str()
<< std::endl); << std::endl);
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"Please specify build tree of the project that uses CMake, specify " "Please specify build tree of the project that uses CMake, "
"CPACK_INSTALL_COMMANDS, or specify CPACK_INSTALLED_DIRECTORIES." "specify CPACK_INSTALL_COMMANDS, or specify "
"CPACK_INSTALLED_DIRECTORIES."
<< std::endl); << std::endl);
parsed = 0; parsed = 0;
} }