[vcpkg] Rename --full-desc to --x-full-desc

This commit is contained in:
Robert Schumacher 2017-06-09 23:45:52 -07:00
parent c0be6aecc6
commit e5dc2f9c8f
2 changed files with 13 additions and 17 deletions

View File

@ -7,16 +7,13 @@
namespace vcpkg::Commands::List
{
static const std::string OPTION_FULLDESC = "--full-desc"; // TODO: This should find a better home, eventually
static const std::string OPTION_FULLDESC = "--x-full-desc"; // TODO: This should find a better home, eventually
static void do_print(const StatusParagraph& pgh, bool FullDesc)
{
if (FullDesc)
{
System::println("%-27s %-16s %s",
pgh.package.displayname(),
pgh.package.version,
pgh.package.description);
System::println("%-27s %-16s %s", pgh.package.displayname(), pgh.package.version, pgh.package.description);
}
else
{
@ -33,7 +30,8 @@ namespace vcpkg::Commands::List
"The argument should be a substring to search for, or no argument to display all installed libraries.\n%s",
Commands::Help::create_example_string("list png"));
args.check_max_arg_count(1, example);
const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_FULLDESC});
const std::unordered_set<std::string> options =
args.check_and_get_optional_command_arguments({OPTION_FULLDESC});
const StatusParagraphs status_paragraphs = database_load_check(paths);
std::vector<StatusParagraph*> installed_packages = get_installed_ports(status_paragraphs);

View File

@ -8,9 +8,8 @@
namespace vcpkg::Commands::Search
{
static const std::string OPTION_GRAPH = "--graph"; // TODO: This should find a better home, eventually
static const std::string OPTION_FULLDESC = "--full-desc"; // TODO: This should find a better home, eventually
static const std::string OPTION_GRAPH = "--graph"; // TODO: This should find a better home, eventually
static const std::string OPTION_FULLDESC = "--x-full-desc"; // TODO: This should find a better home, eventually
static std::string replace_dashes_with_underscore(const std::string& input)
{
@ -51,17 +50,15 @@ namespace vcpkg::Commands::Search
{
if (FullDesc)
{
System::println("%-20s %-16s %s",
source_paragraph.name,
source_paragraph.version,
source_paragraph.description);
System::println(
"%-20s %-16s %s", source_paragraph.name, source_paragraph.version, source_paragraph.description);
}
else
{
System::println("%-20s %-16s %s",
source_paragraph.name,
source_paragraph.version,
details::shorten_description(source_paragraph.description));
source_paragraph.name,
source_paragraph.version,
details::shorten_description(source_paragraph.description));
}
}
@ -71,7 +68,8 @@ namespace vcpkg::Commands::Search
"The argument should be a substring to search for, or no argument to display all libraries.\n%s",
Commands::Help::create_example_string("search png"));
args.check_max_arg_count(1, example);
const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({OPTION_GRAPH, OPTION_FULLDESC});
const std::unordered_set<std::string> options =
args.check_and_get_optional_command_arguments({OPTION_GRAPH, OPTION_FULLDESC});
const std::vector<SourceParagraph> source_paragraphs =
Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports);