merge from master

17 files changed, 171 insertions, 76 deletions

diff --git a/toolsrc/include/vcpkg/base/cstringview.h b/toolsrc/include/vcpkg/base/cstringview.h
index 342455402..0441bc573 100644
--- a/toolsrc/include/vcpkg/base/cstringview.h
+++ b/toolsrc/include/vcpkg/base/cstringview.h
@@ -63,6 +63,8 @@ namespace vcpkg
 
     inline bool operator!=(const std::string& l, const CStringView& r) { return l != r.c_str(); }
 
+    inline std::string operator+(std::string&& l, const CStringView& r) { return std::move(l) + r.c_str(); }
+
     inline const char* to_printf_arg(const CStringView string_view) { return string_view.c_str(); }
 
     static_assert(sizeof(CStringView) == sizeof(void*), "CStringView must be a simple wrapper around char*");
diff --git a/toolsrc/include/vcpkg/base/lineinfo.h b/toolsrc/include/vcpkg/base/lineinfo.h
index 62973462a..e7e8c3031 100644
--- a/toolsrc/include/vcpkg/base/lineinfo.h
+++ b/toolsrc/include/vcpkg/base/lineinfo.h
@@ -9,7 +9,7 @@ namespace vcpkg
         int line_number;
         const char* file_name;
 
-        constexpr LineInfo() : line_number(0), file_name(nullptr) {}
+        constexpr LineInfo() : line_number(0), file_name("") {}
         constexpr LineInfo(const int lineno, const char* filename) : line_number(lineno), file_name(filename) {}
 
         std::string to_string() const;
diff --git a/toolsrc/include/vcpkg/base/span.h b/toolsrc/include/vcpkg/base/span.h
index 6be546351..158f1ac74 100644
--- a/toolsrc/include/vcpkg/base/span.h
+++ b/toolsrc/include/vcpkg/base/span.h
@@ -57,4 +57,16 @@ namespace vcpkg
     {

         return {v.data(), v.size()};

     }

+

+    template<class T>

+    constexpr T* begin(Span<T> sp)

+    {

+        return sp.begin();

+    }

+

+    template<class T>

+    constexpr T* end(Span<T> sp)

+    {

+        return sp.end();

+    }

 }
\ No newline at end of file
diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h
index d263e3b6b..ee1b2fc28 100644
--- a/toolsrc/include/vcpkg/base/strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -76,9 +76,9 @@ namespace vcpkg::Strings
         return join(delimiter, v, [](const Element& x) -> const Element& { return x; });
     }
 
-    void trim(std::string* s);
+    std::string replace_all(std::string&& s, const std::string& search, const std::string& rep);
 
-    std::string trimmed(const std::string& s);
+    std::string trim(std::string&& s);
 
     void trim_all_and_remove_whitespace_strings(std::vector<std::string>* strings);
 
diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h
index b396ef293..9f2d91435 100644
--- a/toolsrc/include/vcpkg/base/system.h
+++ b/toolsrc/include/vcpkg/base/system.h
@@ -22,7 +22,9 @@ namespace vcpkg::System
 
     ExitCodeAndOutput cmd_execute_and_capture_output(const CStringView cmd_line);
 
-    std::string create_powershell_script_cmd(const fs::path& script_path, const CStringView args = "");
+    std::string powershell_execute_and_capture_output(const std::string& title,
+                                                      const fs::path& script_path,
+                                                      const CStringView args = "");
 
     enum class Color
     {
@@ -38,27 +40,27 @@ namespace vcpkg::System
     void println(const Color c, const CStringView message);
 
     template<class Arg1, class... Args>
-    void print(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
+    void print(const char* message_template, const Arg1& message_arg1, const Args&... message_args)
     {
-        return System::print(Strings::format(messageTemplate, messageArg1, messageArgs...));
+        return System::print(Strings::format(message_template, message_arg1, message_args...));
     }
 
     template<class Arg1, class... Args>
-    void print(const Color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
+    void print(const Color c, const char* message_template, const Arg1& message_arg1, const Args&... message_args)
     {
-        return System::print(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
+        return System::print(c, Strings::format(message_template, message_arg1, message_args...));
     }
 
     template<class Arg1, class... Args>
-    void println(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
+    void println(const char* message_template, const Arg1& message_arg1, const Args&... message_args)
     {
-        return System::println(Strings::format(messageTemplate, messageArg1, messageArgs...));
+        return System::println(Strings::format(message_template, message_arg1, message_args...));
     }
 
     template<class Arg1, class... Args>
-    void println(const Color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
+    void println(const Color c, const char* message_template, const Arg1& message_arg1, const Args&... message_args)
     {
-        return System::println(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
+        return System::println(c, Strings::format(message_template, message_arg1, message_args...));
     }
 
     Optional<std::string> get_environment_variable(const CStringView varname) noexcept;
@@ -90,17 +92,17 @@ namespace vcpkg::Debug
     void println(const System::Color c, const CStringView message);
 
     template<class Arg1, class... Args>
-    void println(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
+    void println(const char* message_template, const Arg1& message_arg1, const Args&... message_args)
     {
-        return Debug::println(Strings::format(messageTemplate, messageArg1, messageArgs...));
+        return Debug::println(Strings::format(message_template, message_arg1, message_args...));
     }
 
     template<class Arg1, class... Args>
     void println(const System::Color c,
-                 const char* messageTemplate,
-                 const Arg1& messageArg1,
-                 const Args&... messageArgs)
+                 const char* message_template,
+                 const Arg1& message_arg1,
+                 const Args&... message_args)
     {
-        return Debug::println(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
+        return Debug::println(c, Strings::format(message_template, message_arg1, message_args...));
     }
 }
diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h
index d5db6b6ee..155b16cf7 100644
--- a/toolsrc/include/vcpkg/base/util.h
+++ b/toolsrc/include/vcpkg/base/util.h
@@ -20,8 +20,17 @@ namespace vcpkg::Util
         }
     }
 
+    namespace Sets
+    {
+        template<class Container, class T = ElementT<Container>>
+        bool contains(const Container& container, const T& item)
+        {
+            return container.find(item) != container.cend();
+        }
+    }
+
     template<class Cont, class Func>
-    using FmapOut = decltype(std::declval<Func>()(*begin(std::declval<Cont>())));
+    using FmapOut = decltype(std::declval<Func&>()(*begin(std::declval<Cont&>())));
 
     template<class Cont, class Func, class Out = FmapOut<Cont, Func>>
     std::vector<Out> fmap(Cont&& xs, Func&& f)
@@ -108,6 +117,22 @@ namespace vcpkg::Util
         }
     }
 
+    template<class Range>
+    void sort(Range& cont)
+    {
+        using std::begin;
+        using std::end;
+        std::sort(begin(cont), end(cont));
+    }
+
+    template<class Range1, class Range2>
+    bool all_equal(const Range1& r1, const Range2& r2)
+    {
+        using std::begin;
+        using std::end;
+        return std::equal(begin(r1), end(r1), begin(r2), end(r2));
+    }
+
     template<class AssocContainer, class K = std::decay_t<decltype(begin(std::declval<AssocContainer>())->first)>>
     std::vector<K> extract_keys(AssocContainer&& input_map)
     {
diff --git a/toolsrc/include/vcpkg/binaryparagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h
index 7eb50a6d7..f59bf693a 100644
--- a/toolsrc/include/vcpkg/binaryparagraph.h
+++ b/toolsrc/include/vcpkg/binaryparagraph.h
@@ -30,6 +30,7 @@ namespace vcpkg
         std::string feature;
         std::vector<std::string> default_features;
         std::vector<std::string> depends;
+        std::string abi;
     };
 
     struct BinaryControlFile
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 774e25922..824f3ccaf 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -18,10 +18,10 @@ namespace vcpkg::Build
 {
     namespace Command
     {
-        void perform_and_exit(const FullPackageSpec& full_spec,
-                              const fs::path& port_dir,
-                              const std::unordered_set<std::string>& options,
-                              const VcpkgPaths& paths);
+        void perform_and_exit_ex(const FullPackageSpec& full_spec,
+                                 const fs::path& port_dir,
+                                 const ParsedArguments& options,
+                                 const VcpkgPaths& paths);
 
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
@@ -65,15 +65,17 @@ namespace vcpkg::Build
         BUILD_FAILED,
         POST_BUILD_CHECKS_FAILED,
         FILE_CONFLICTS,
-        CASCADED_DUE_TO_MISSING_DEPENDENCIES
+        CASCADED_DUE_TO_MISSING_DEPENDENCIES,
+        EXCLUDED,
     };
 
-    static constexpr std::array<BuildResult, 5> BUILD_RESULT_VALUES = {
+    static constexpr std::array<BuildResult, 6> BUILD_RESULT_VALUES = {
         BuildResult::SUCCEEDED,
         BuildResult::BUILD_FAILED,
         BuildResult::POST_BUILD_CHECKS_FAILED,
         BuildResult::FILE_CONFLICTS,
-        BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES};
+        BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES,
+        BuildResult::EXCLUDED};
 
     const std::string& to_string(const BuildResult build_result);
     std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
index e00812c98..74fd80c03 100644
--- a/toolsrc/include/vcpkg/commands.h
+++ b/toolsrc/include/vcpkg/commands.h
@@ -23,16 +23,19 @@ namespace vcpkg::Commands
 
     namespace CI
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace Env
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace Create
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
 
@@ -49,16 +52,19 @@ namespace vcpkg::Commands
 
     namespace Search
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
 
     namespace List
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
 
     namespace Owns
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
 
@@ -75,6 +81,7 @@ namespace vcpkg::Commands
     namespace Integrate
     {
         extern const char* const INTEGRATE_COMMAND_HELPSTRING;
+        extern const CommandStructure COMMAND_STRUCTURE;
 
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }
@@ -98,6 +105,7 @@ namespace vcpkg::Commands
 
     namespace Contact
     {
+        extern const CommandStructure COMMAND_STRUCTURE;
         const std::string& email();
         void perform_and_exit(const VcpkgCmdArguments& args);
     }
diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h
index 585338ae2..5411ee166 100644
--- a/toolsrc/include/vcpkg/dependencies.h
+++ b/toolsrc/include/vcpkg/dependencies.h
@@ -3,6 +3,7 @@
 #include <vcpkg/base/graphs.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
+#include <vcpkg/build.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgpaths.h>
@@ -18,6 +19,9 @@ namespace vcpkg::Dependencies
         AUTO_SELECTED
     };
 
+    std::string to_output_string(RequestType request_type,
+                                 const CStringView s,
+                                 const Build::BuildPackageOptions& options);
     std::string to_output_string(RequestType request_type, const CStringView s);
 
     struct AnyParagraph
@@ -38,7 +42,8 @@ namespace vcpkg::Dependencies
         UNKNOWN,
         BUILD_AND_INSTALL,
         INSTALL,
-        ALREADY_INSTALLED
+        ALREADY_INSTALLED,
+        EXCLUDED
     };
 
     struct InstallPlanAction : Util::MoveOnlyBase
@@ -62,6 +67,7 @@ namespace vcpkg::Dependencies
         AnyParagraph any_paragraph;
         InstallPlanType plan_type;
         RequestType request_type;
+        Build::BuildPackageOptions build_options;
         std::unordered_set<std::string> feature_list;
     };
 
diff --git a/toolsrc/include/vcpkg/export.h b/toolsrc/include/vcpkg/export.h
index f3285e187..eb99b4fb1 100644
--- a/toolsrc/include/vcpkg/export.h
+++ b/toolsrc/include/vcpkg/export.h
@@ -4,6 +4,8 @@
 
 namespace vcpkg::Export
 {
+    extern const CommandStructure COMMAND_STRUCTURE;
+
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
 
     void export_integration_files(const fs::path& raw_exported_dir_path, const VcpkgPaths& paths);
diff --git a/toolsrc/include/vcpkg/help.h b/toolsrc/include/vcpkg/help.h
index 39ad6912d..73549efd7 100644
--- a/toolsrc/include/vcpkg/help.h
+++ b/toolsrc/include/vcpkg/help.h
@@ -7,13 +7,13 @@
 
 namespace vcpkg::Help
 {
+    extern const CommandStructure COMMAND_STRUCTURE;
+
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
 
     void help_topic_valid_triplet(const VcpkgPaths& paths);
 
     void print_usage();
 
-    void print_example(const std::string& command_and_arguments);
-
     std::string create_example_string(const std::string& command_and_arguments);
 }
diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h
index db6055f4f..7bf823e99 100644
--- a/toolsrc/include/vcpkg/install.h
+++ b/toolsrc/include/vcpkg/install.h
@@ -17,13 +17,22 @@ namespace vcpkg::Install
 
     inline KeepGoing to_keep_going(const bool value) { return value ? KeepGoing::YES : KeepGoing::NO; }
 
-    enum class PrintSummary
+    struct SpecSummary
     {
-        NO = 0,
-        YES
+        explicit SpecSummary(const PackageSpec& spec);
+
+        PackageSpec spec;
+        Build::BuildResult result;
+        std::string timing;
     };
 
-    inline PrintSummary to_print_summary(const bool value) { return value ? PrintSummary::YES : PrintSummary::NO; }
+    struct InstallSummary
+    {
+        std::vector<SpecSummary> results;
+        std::string total_elapsed_time;
+
+        void print() const;
+    };
 
     struct InstallDir
     {
@@ -44,7 +53,6 @@ namespace vcpkg::Install
 
     Build::BuildResult perform_install_plan_action(const VcpkgPaths& paths,
                                                    const Dependencies::InstallPlanAction& action,
-                                                   const Build::BuildPackageOptions& install_plan_options,
                                                    StatusParagraphs& status_db);
 
     enum class InstallResult
@@ -53,17 +61,17 @@ namespace vcpkg::Install
         SUCCESS,
     };
 
+    std::vector<std::string> get_all_port_names(const VcpkgPaths& paths);
+
     void install_files_and_write_listfile(Files::Filesystem& fs, const fs::path& source_dir, const InstallDir& dirs);
     InstallResult install_package(const VcpkgPaths& paths,
                                   const BinaryControlFile& binary_paragraph,
                                   StatusParagraphs* status_db);
 
-    void perform_and_exit_ex(const std::vector<Dependencies::AnyAction>& action_plan,
-                             const Build::BuildPackageOptions& install_plan_options,
-                             const KeepGoing keep_going,
-                             const PrintSummary print_summary,
-                             const VcpkgPaths& paths,
-                             StatusParagraphs& status_db);
+    InstallSummary perform(const std::vector<Dependencies::AnyAction>& action_plan,
+                           const KeepGoing keep_going,
+                           const VcpkgPaths& paths,
+                           StatusParagraphs& status_db);
 
     extern const CommandStructure COMMAND_STRUCTURE;
 
diff --git a/toolsrc/include/vcpkg/packagespec.h b/toolsrc/include/vcpkg/packagespec.h
index 60c99782e..0487ae6b8 100644
--- a/toolsrc/include/vcpkg/packagespec.h
+++ b/toolsrc/include/vcpkg/packagespec.h
@@ -20,6 +20,8 @@ namespace vcpkg
         static ExpectedT<PackageSpec, PackageSpecParseResult> from_name_and_triplet(const std::string& name,
                                                                                     const Triplet& triplet);
 
+        static std::vector<PackageSpec> to_package_specs(const std::vector<std::string>& ports, const Triplet& triplet);
+
         const std::string& name() const;
 
         const Triplet& triplet() const;
@@ -48,6 +50,22 @@ namespace vcpkg
         static std::vector<FeatureSpec> from_strings_and_triplet(const std::vector<std::string>& depends,
                                                                  const Triplet& t);
 
+        bool operator<(const FeatureSpec& other) const
+        {
+            if (name() < other.name()) return true;
+            if (name() > other.name()) return false;
+            if (feature() < other.feature()) return true;
+            if (feature() > other.feature()) return false;
+            return triplet() < other.triplet();
+        }
+
+        bool operator==(const FeatureSpec& other) const
+        {
+            return triplet() == other.triplet() && name() == other.name() && feature() == other.feature();
+        }
+
+        bool operator!=(const FeatureSpec& other) const { return !(*this == other); }
+
     private:
         PackageSpec m_spec;
         std::string m_feature;
diff --git a/toolsrc/include/vcpkg/statusparagraphs.h b/toolsrc/include/vcpkg/statusparagraphs.h
index c2f3b7b8e..747a0c1ab 100644
--- a/toolsrc/include/vcpkg/statusparagraphs.h
+++ b/toolsrc/include/vcpkg/statusparagraphs.h
@@ -16,10 +16,10 @@ namespace vcpkg
         using const_iterator = container::const_reverse_iterator;
 
         const_iterator find(const PackageSpec& spec) const { return find(spec.name(), spec.triplet()); }
-        const_iterator find(const std::string& name, const Triplet& triplet) const;
-        iterator find(const std::string& name, const Triplet& triplet);
+        iterator find(const std::string& name, const Triplet& triplet, const std::string& feature = "");
+        const_iterator find(const std::string& name, const Triplet& triplet, const std::string& feature = "") const;
+
         std::vector<std::unique_ptr<StatusParagraph>*> find_all(const std::string& name, const Triplet& triplet);
-        iterator find(const std::string& name, const Triplet& triplet, const std::string& feature);
 
         const_iterator find_installed(const PackageSpec& spec) const
         {
diff --git a/toolsrc/include/vcpkg/triplet.h b/toolsrc/include/vcpkg/triplet.h
index 50d731593..2cfc2d02a 100644
--- a/toolsrc/include/vcpkg/triplet.h
+++ b/toolsrc/include/vcpkg/triplet.h
@@ -24,6 +24,7 @@ namespace vcpkg
         size_t hash_code() const;
 
         bool operator==(const Triplet& other) const;
+        bool operator<(const Triplet& other) const { return canonical_name() < other.canonical_name(); }
 
     private:
         static const TripletInstance DEFAULT_INSTANCE;
diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
index d9895f4b8..93eeb6ef5 100644
--- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h
+++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
@@ -17,13 +17,49 @@ namespace vcpkg
         std::unordered_map<std::string, std::string> settings;
     };
 
-    struct VcpkgCmdArguments
+    struct VcpkgPaths;
+
+    struct CommandSwitch
+    {
+        std::string name;
+        CStringView short_help_text;
+    };
+
+    struct CommandSetting
     {
+        std::string name;
+        CStringView short_help_text;
+    };
+
+    struct CommandOptionsStructure
+    {
+        Span<const CommandSwitch> switches;
+        Span<const CommandSetting> settings;
+    };
+
+    struct CommandStructure
+    {
+        std::string example_text;
+
+        size_t minimum_arity;
+        size_t maximum_arity;
+
+        CommandOptionsStructure options;
+
+        std::vector<std::string> (*valid_arguments)(const VcpkgPaths& paths);
+    };
+
+    void display_usage(const CommandStructure& command_structure);
+
 #if defined(_WIN32)
-        static VcpkgCmdArguments create_from_command_line(const int argc, const wchar_t* const* const argv);
+    using CommandLineCharType = wchar_t;
 #else
-        static VcpkgCmdArguments create_from_command_line(const int argc, const char* const* const argv);
+    using CommandLineCharType = char;
 #endif
+
+    struct VcpkgCmdArguments
+    {
+        static VcpkgCmdArguments create_from_command_line(const int argc, const CommandLineCharType* const* const argv);
         static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end);
 
         std::unique_ptr<std::string> vcpkg_root_dir;
@@ -34,38 +70,10 @@ namespace vcpkg
 
         std::string command;
         std::vector<std::string> command_arguments;
-        std::unordered_set<std::string> check_and_get_optional_command_arguments(
-            const std::vector<std::string>& valid_options) const
-        {
-            return std::move(check_and_get_optional_command_arguments(valid_options, {}).switches);
-        }
-
-        ParsedArguments check_and_get_optional_command_arguments(const std::vector<std::string>& valid_switches,
-                                                                 const std::vector<std::string>& valid_settings) const;
-
-        void check_max_arg_count(const size_t expected_arg_count) const;
-        void check_max_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
-        void check_min_arg_count(const size_t expected_arg_count) const;
-        void check_min_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
-        void check_exact_arg_count(const size_t expected_arg_count) const;
-        void check_exact_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
+
+        ParsedArguments parse_arguments(const CommandStructure& command_structure) const;
 
     private:
         std::unordered_map<std::string, Optional<std::string>> optional_command_arguments;
     };
-
-    struct VcpkgPaths;
-
-    struct CommandStructure
-    {
-        CStringView example_text;
-
-        size_t minimum_arity;
-        size_t maximum_arity;
-
-        Span<const std::string> switches;
-        Span<const std::string> settings;
-
-        std::vector<std::string> (*valid_arguments)(const VcpkgPaths& paths);
-    };
 }