diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-12 22:03:57 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-12 22:03:57 -0800 |
| commit | cc8851144a871931b93d84bd962364159ad1c424 (patch) | |
| tree | db9511533d051dcbcd3c8a2edc6854aa4ff7e9e7 /toolsrc/src/commands_build_external.cpp | |
| parent | 8e1ed2c9a95fa5b9e0bb0a9849a6e20878696f8c (diff) | |
| download | vcpkg-cc8851144a871931b93d84bd962364159ad1c424.tar.gz vcpkg-cc8851144a871931b93d84bd962364159ad1c424.zip | |
Reorganize commands, each in its own namespace
Additionally, functions related to a command can now live
in the same namespace
Diffstat (limited to 'toolsrc/src/commands_build_external.cpp')
| -rw-r--r-- | toolsrc/src/commands_build_external.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/commands_build_external.cpp index 5ed52ad97..09a9256d7 100644 --- a/toolsrc/src/commands_build_external.cpp +++ b/toolsrc/src/commands_build_external.cpp @@ -4,11 +4,11 @@ #include "vcpkg_Input.h" #include "vcpkg.h" -namespace vcpkg::Commands +namespace vcpkg::Commands::BuildExternal { - void build_external_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) + void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) { - static const std::string example = Commands::Helpers::create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)"); + static const std::string example = Commands::Help::create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)"); args.check_exact_arg_count(2, example); expected<package_spec> maybe_current_spec = package_spec::from_string(args.command_arguments[0], default_target_triplet); @@ -20,13 +20,13 @@ namespace vcpkg::Commands const expected<SourceParagraph> maybe_spgh = try_load_port(port_dir); if (auto spgh = maybe_spgh.get()) { - Commands::build_internal(*spgh, *spec, paths, port_dir); + Commands::Build::build_package(*spgh, *spec, paths, port_dir); exit(EXIT_SUCCESS); } } System::println(System::color::error, "Error: %s: %s", maybe_current_spec.error_code().message(), args.command_arguments[0]); - Commands::Helpers::print_example(Strings::format("%s zlib:x64-windows", args.command)); + Commands::Help::print_example(Strings::format("%s zlib:x64-windows", args.command)); exit(EXIT_FAILURE); } } |
