[vcpkg] Add support for single-option arguments.

1 files changed, 60 insertions, 9 deletions

diff --git a/toolsrc/src/VcpkgCmdArguments.cpp b/toolsrc/src/VcpkgCmdArguments.cpp
index 62e0b114c..ebf4c5fc5 100644
--- a/toolsrc/src/VcpkgCmdArguments.cpp
+++ b/toolsrc/src/VcpkgCmdArguments.cpp
@@ -123,7 +123,15 @@ namespace vcpkg
                     continue;
                 }
 
-                args.optional_command_arguments.insert(arg);
+                auto eq_pos = arg.find('=');
+                if (eq_pos != std::string::npos)
+                {
+                    args.optional_command_arguments.emplace(arg.substr(0, eq_pos), arg.substr(eq_pos + 1));
+                }
+                else
+                {
+                    args.optional_command_arguments.emplace(arg, nullopt);
+                }
                 continue;
             }
 
@@ -140,30 +148,73 @@ namespace vcpkg
         return args;
     }
 
-    std::unordered_set<std::string> VcpkgCmdArguments::check_and_get_optional_command_arguments(
-        const std::vector<std::string>& valid_options) const
+    ParsedArguments VcpkgCmdArguments::check_and_get_optional_command_arguments(
+        const std::vector<std::string>& valid_switches, const std::vector<std::string>& valid_settings) const
     {
-        std::unordered_set<std::string> output;
+        bool failed = false;
+        ParsedArguments output;
+
         auto options_copy = this->optional_command_arguments;
-        for (const std::string& option : valid_options)
+        for (const std::string& option : valid_switches)
         {
             auto it = options_copy.find(option);
             if (it != options_copy.end())
             {
-                output.insert(option);
-                options_copy.erase(it);
+                if (it->second.has_value())
+                {
+                    // Having a string value indicates it was passed like '--a=xyz'
+                    System::println(System::Color::error, "The option '%s' does not accept an argument.", option);
+                    failed = true;
+                }
+                else
+                {
+                    output.switches.insert(option);
+                    options_copy.erase(it);
+                }
+            }
+        }
+
+        for (const std::string& option : valid_settings)
+        {
+            auto it = options_copy.find(option);
+            if (it != options_copy.end())
+            {
+                if (!it->second.has_value())
+                {
+                    // Not having a string value indicates it was passed like '--a'
+                    System::println(System::Color::error, "The option '%s' must be passed an argument.", option);
+                    failed = true;
+                }
+                else
+                {
+                    output.settings.emplace(option, it->second.value_or_exit(VCPKG_LINE_INFO));
+                    options_copy.erase(it);
+                }
             }
         }
 
         if (!options_copy.empty())
         {
             System::println(System::Color::error, "Unknown option(s) for command '%s':", this->command);
-            for (const std::string& option : options_copy)
+            for (auto&& option : options_copy)
+            {
+                System::println("    %s", option.first);
+            }
+            System::println("\nValid options are:", this->command);
+            for (auto&& option : valid_switches)
             {
-                System::println(option);
+                System::println("    %s", option);
             }
+            for (auto&& option : valid_settings)
+            {
+                System::println("    %s=...", option);
+            }
+            System::println("    --triplet <t>");
+            System::println("    --vcpkg-root <path>");
+
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
+        if (failed) Checks::exit_fail(VCPKG_LINE_INFO);
 
         return output;
     }