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

cmDocumentation: Fix exit after help output format warnings 

After warning that a help output format is no longer supported, fix the
return value from cmDocumentation::CheckOptions to indicate that it was
still a help option that was parsed.  Otherwise CMake moves on to treat
the help output file name as a source tree and complains that it does
not exist.
This commit is contained in:
Brad King 2013-11-19 10:58:16 -05:00
parent 1da77bf1ee
commit e7434d43ab
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmDocumentation.cxx
View File

@ -195,24 +195,27 @@ bool cmDocumentation::PrintRequestedDocumentation(std::ostream& os)
void cmDocumentation::WarnFormFromFilename( void cmDocumentation::WarnFormFromFilename(
cmDocumentation::RequestedHelpItem& request) cmDocumentation::RequestedHelpItem& request, bool& result)
{ {
std::string ext = cmSystemTools::GetFilenameLastExtension(request.Filename); std::string ext = cmSystemTools::GetFilenameLastExtension(request.Filename);
ext = cmSystemTools::UpperCase(ext); ext = cmSystemTools::UpperCase(ext);
if ((ext == ".HTM") || (ext == ".HTML")) if ((ext == ".HTM") || (ext == ".HTML"))
{ {
request.HelpType = cmDocumentation::None; request.HelpType = cmDocumentation::None;
result = true;
cmSystemTools::Message("Warning: HTML help format no longer supported"); cmSystemTools::Message("Warning: HTML help format no longer supported");
} }
else if (ext == ".DOCBOOK") else if (ext == ".DOCBOOK")
{ {
request.HelpType = cmDocumentation::None; request.HelpType = cmDocumentation::None;
result = true;
cmSystemTools::Message("Warning: Docbook help format no longer supported"); cmSystemTools::Message("Warning: Docbook help format no longer supported");
} }
// ".1" to ".9" should be manpages // ".1" to ".9" should be manpages
else if ((ext.length()==2) && (ext[1] >='1') && (ext[1]<='9')) else if ((ext.length()==2) && (ext[1] >='1') && (ext[1]<='9'))
{ {
request.HelpType = cmDocumentation::None; request.HelpType = cmDocumentation::None;
result = true;
cmSystemTools::Message("Warning: Man help format no longer supported"); cmSystemTools::Message("Warning: Man help format no longer supported");
} }
} }
@ -300,28 +303,28 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv,
help.HelpType = cmDocumentation::OneManual; help.HelpType = cmDocumentation::OneManual;
help.Argument = "cmake-properties.7"; help.Argument = "cmake-properties.7";
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-policies") == 0) else if(strcmp(argv[i], "--help-policies") == 0)
{ {
help.HelpType = cmDocumentation::OneManual; help.HelpType = cmDocumentation::OneManual;
help.Argument = "cmake-policies.7"; help.Argument = "cmake-policies.7";
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-variables") == 0) else if(strcmp(argv[i], "--help-variables") == 0)
{ {
help.HelpType = cmDocumentation::OneManual; help.HelpType = cmDocumentation::OneManual;
help.Argument = "cmake-variables.7"; help.Argument = "cmake-variables.7";
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-modules") == 0) else if(strcmp(argv[i], "--help-modules") == 0)
{ {
help.HelpType = cmDocumentation::OneManual; help.HelpType = cmDocumentation::OneManual;
help.Argument = "cmake-modules.7"; help.Argument = "cmake-modules.7";
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-custom-modules") == 0) else if(strcmp(argv[i], "--help-custom-modules") == 0)
{ {
@ -335,7 +338,7 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv,
help.HelpType = cmDocumentation::OneManual; help.HelpType = cmDocumentation::OneManual;
help.Argument = "cmake-commands.7"; help.Argument = "cmake-commands.7";
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-compatcommands") == 0) else if(strcmp(argv[i], "--help-compatcommands") == 0)
{ {
@ -368,42 +371,42 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv,
GET_OPT_ARGUMENT(help.Argument); GET_OPT_ARGUMENT(help.Argument);
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
help.Argument = cmSystemTools::LowerCase(help.Argument); help.Argument = cmSystemTools::LowerCase(help.Argument);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-module") == 0) else if(strcmp(argv[i], "--help-module") == 0)
{ {
help.HelpType = cmDocumentation::OneModule; help.HelpType = cmDocumentation::OneModule;
GET_OPT_ARGUMENT(help.Argument); GET_OPT_ARGUMENT(help.Argument);
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-property") == 0) else if(strcmp(argv[i], "--help-property") == 0)
{ {
help.HelpType = cmDocumentation::OneProperty; help.HelpType = cmDocumentation::OneProperty;
GET_OPT_ARGUMENT(help.Argument); GET_OPT_ARGUMENT(help.Argument);
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-policy") == 0) else if(strcmp(argv[i], "--help-policy") == 0)
{ {
help.HelpType = cmDocumentation::OnePolicy; help.HelpType = cmDocumentation::OnePolicy;
GET_OPT_ARGUMENT(help.Argument); GET_OPT_ARGUMENT(help.Argument);
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-variable") == 0) else if(strcmp(argv[i], "--help-variable") == 0)
{ {
help.HelpType = cmDocumentation::OneVariable; help.HelpType = cmDocumentation::OneVariable;
GET_OPT_ARGUMENT(help.Argument); GET_OPT_ARGUMENT(help.Argument);
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-manual") == 0) else if(strcmp(argv[i], "--help-manual") == 0)
{ {
help.HelpType = cmDocumentation::OneManual; help.HelpType = cmDocumentation::OneManual;
GET_OPT_ARGUMENT(help.Argument); GET_OPT_ARGUMENT(help.Argument);
GET_OPT_ARGUMENT(help.Filename); GET_OPT_ARGUMENT(help.Filename);
this->WarnFormFromFilename(help); this->WarnFormFromFilename(help, result);
} }
else if(strcmp(argv[i], "--help-command-list") == 0) else if(strcmp(argv[i], "--help-command-list") == 0)
{ {

2
Source/cmDocumentation.h
View File

@ -137,7 +137,7 @@ private:
std::vector<RequestedHelpItem> RequestedHelpItems; std::vector<RequestedHelpItem> RequestedHelpItems;
cmDocumentationFormatter Formatter; cmDocumentationFormatter Formatter;
static void WarnFormFromFilename(RequestedHelpItem& request); static void WarnFormFromFilename(RequestedHelpItem& request, bool& result);
}; };
#endif #endif