Merge remote-tracking branch 'refs/remotes/upstream/master'

1 files changed, 96 insertions, 29 deletions

diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index fd427fd40..8d772b255 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -3,45 +3,112 @@
 #include "vcpkg_cmd_arguments.h"
 #include "vcpkg_paths.h"
 
-namespace vcpkg
+namespace vcpkg::Commands
 {
-    extern const char*const INTEGRATE_COMMAND_HELPSTRING;
+    using command_type_a = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+    using command_type_b = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    using command_type_c = void(*)(const vcpkg_cmd_arguments& args);
 
-    void print_usage();
-    void print_example(const std::string& command_and_arguments);
-    std::string create_example_string(const std::string& command_and_arguments);
-    void update_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    namespace Build
+    {
+        void build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir);
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+    }
+
+    namespace BuildExternal
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+    }
 
-    void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
-    void build_external_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
-    void install_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
-    void remove_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+    namespace Install
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+    }
 
-    void edit_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void create_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    namespace Remove
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
+    }
 
-    void search_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void list_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void import_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void owns_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void internal_test_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    namespace Update
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
 
-    void cache_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    namespace Create
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
 
-    void integrate_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    namespace Edit
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
 
-    void portsdiff_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    namespace Search
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
 
-    void help_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void help_topic_valid_triplet(const vcpkg_paths& paths);
+    namespace List
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
 
-    void version_command(const vcpkg_cmd_arguments& args);
-    void contact_command(const vcpkg_cmd_arguments& args);
-    void hash_command(const vcpkg_cmd_arguments& args);
+    namespace Import
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
 
-    using command_type_a = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
-    using command_type_b = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    using command_type_c = void(*)(const vcpkg_cmd_arguments& args);
+    namespace Owns
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
+
+    namespace Cache
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
+
+    namespace Integrate
+    {
+        extern const char*const INTEGRATE_COMMAND_HELPSTRING;
+
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
+
+    namespace PortsDiff
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+    }
+
+    namespace Help
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
+
+        void help_topic_valid_triplet(const vcpkg_paths& paths);
+
+        void print_usage();
+
+        void print_example(const std::string& command_and_arguments);
+
+        std::string create_example_string(const std::string& command_and_arguments);
+    }
+
+    namespace Version
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args);
+    }
+
+    namespace Contact
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args);
+    }
+
+    namespace Hash
+    {
+        void perform_and_exit(const vcpkg_cmd_arguments& args);
+    }
 
     template <class T>
     struct package_name_and_function
@@ -55,7 +122,7 @@ namespace vcpkg
     const std::vector<package_name_and_function<command_type_c>>& get_available_commands_type_c();
 
     template <typename T>
-    T find_command(const std::string& command_name, const std::vector<package_name_and_function<T>> available_commands)
+    T find(const std::string& command_name, const std::vector<package_name_and_function<T>> available_commands)
     {
         for (const package_name_and_function<T>& cmd : available_commands)
         {