diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 11:24:04 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 15:02:08 -0700 |
| commit | b2c1076aef280e7ebfd38845dfcb4d4b66cd45e3 (patch) | |
| tree | 0634b559eede7b53890abe8b271a9b66b2e0249c /toolsrc/src/commands_installation.cpp | |
| parent | 82d145c9bcce22bf9b5b2a88fdab5b3eb2f5f377 (diff) | |
| download | vcpkg-b2c1076aef280e7ebfd38845dfcb4d4b66cd45e3.tar.gz vcpkg-b2c1076aef280e7ebfd38845dfcb4d4b66cd45e3.zip | |
All commands now use the new functions for argument checking
Diffstat (limited to 'toolsrc/src/commands_installation.cpp')
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 6604685c0..baa0e6951 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -65,6 +65,8 @@ namespace vcpkg void install_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) { + static const std::string example = create_example_string("install zlib zlib:x64-windows curl boost"); + args.check_min_arg_count(1, example.c_str()); StatusParagraphs status_db = database_load_check(paths); std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(default_target_triplet); @@ -120,10 +122,12 @@ namespace vcpkg void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) { + static const std::string example = create_example_string("build zlib:x64-windows"); + // Installing multiple packages leads to unintuitive behavior if one of them depends on another. - // Allowing only 1 package for now. - args.check_max_arg_count(1); + // Allowing only 1 package for now. + args.check_exact_arg_count(1, example.c_str()); StatusParagraphs status_db = database_load_check(paths); const package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet).at(0); @@ -148,12 +152,8 @@ namespace vcpkg void build_external_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) { - if (args.command_arguments.size() != 2) - { - System::println(System::color::error, "Error: buildexternal requires the package name and the directory containing the CONTROL file"); - print_example(R"(buildexternal mylib C:\path\to\mylib\)"); - exit(EXIT_FAILURE); - } + static const std::string example = create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)"); + args.check_exact_arg_count(2, example.c_str()); expected<package_spec> current_spec = package_spec::from_string(args.command_arguments[0], default_target_triplet); if (auto spec = current_spec.get()) |