aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_install.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-01-12 22:03:57 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2017-01-12 22:03:57 -0800
commitcc8851144a871931b93d84bd962364159ad1c424 (patch)
treedb9511533d051dcbcd3c8a2edc6854aa4ff7e9e7 /toolsrc/src/commands_install.cpp
parent8e1ed2c9a95fa5b9e0bb0a9849a6e20878696f8c (diff)
downloadvcpkg-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_install.cpp')
-rw-r--r--toolsrc/src/commands_install.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index ff5ddb0e7..ff517d9b1 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -7,7 +7,7 @@
#include "vcpkg_Dependencies.h"
#include "vcpkg_Input.h"
-namespace vcpkg::Commands
+namespace vcpkg::Commands::Install
{
using Dependencies::package_spec_with_install_plan;
using Dependencies::install_plan_type;
@@ -183,9 +183,9 @@ namespace vcpkg::Commands
status_db.insert(std::make_unique<StatusParagraph>(spgh));
}
- void install_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("install zlib zlib:x64-windows curl boost");
+ static const std::string example = Commands::Help::create_example_string("install zlib zlib:x64-windows curl boost");
args.check_min_arg_count(1, example);
StatusParagraphs status_db = database_load_check(paths);
@@ -216,7 +216,7 @@ namespace vcpkg::Commands
}
else if (action.plan.type == install_plan_type::BUILD_AND_INSTALL)
{
- Commands::build_internal(*action.plan.spgh, action.spec, paths, paths.port_dir(action.spec));
+ Commands::Build::build_package(*action.plan.spgh, action.spec, paths, paths.port_dir(action.spec));
const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();
install_package(paths, bpgh, status_db);
System::println(System::color::success, "Package %s is installed", action.spec);