[vcpkg] Add keyword Supports to Feature in CONTROL file and manifest

ports/libtorrent/CONTROL

@@ -1,5 +1,5 @@
 Source: libtorrent
-Version: 1.2.7
+Version: 1.2.10
 Port-Version: 1
 Homepage: https://github.com/arvidn/libtorrent
 Description: An efficient feature complete C++ BitTorrent implementation

toolsrc/include/vcpkg/dependencies.h

@@ -165,8 +165,7 @@ namespace vcpkg::Dependencies
                                            const CMakeVars::CMakeVarProvider& var_provider,
                                            const std::vector<FullPackageSpec>& specs,
                                            const StatusParagraphs& status_db,
-                                           const CreateInstallPlanOptions& options = {},
-                                           bool allFeatures = false);
+                                           const CreateInstallPlanOptions& options = {});
 
     ActionPlan create_upgrade_plan(const PortFileProvider::PortFileProvider& provider,
                                    const CMakeVars::CMakeVarProvider& var_provider,

toolsrc/include/vcpkg/sourceparagraph.h

@@ -42,6 +42,11 @@ namespace vcpkg
         std::vector<std::string> description;
         std::vector<Dependency> dependencies;
         PlatformExpression::Expr supports_expression;
+
+        Json::Object extra_info;
+
+        friend bool operator==(const FeatureParagraph& lhs, const FeatureParagraph& rhs);
+        friend bool operator!=(const FeatureParagraph& lhs, const FeatureParagraph& rhs) { return !(lhs == rhs); }
     };
 
     /// <summary>

toolsrc/src/vcpkg/commands.ci.cpp

@@ -19,8 +19,6 @@
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
 
-#include <algorithm>
-
 using namespace vcpkg;
 
 namespace
@@ -385,7 +383,6 @@ namespace vcpkg::Commands::CI
                 }
                 else
                 {
-                    // include_all_supported_features_for_triplet(var_provider, p);
                     ret->unknown.emplace_back(p->spec, p->feature_list);
                     b_will_build = true;
                 }
@@ -503,7 +500,7 @@ namespace vcpkg::Commands::CI
             }
 
             auto action_plan = Dependencies::create_feature_install_plan(
-                new_default_provider, var_provider, split_specs->unknown, status_db, serialize_options, true);
+                new_default_provider, var_provider, split_specs->unknown, status_db, serialize_options);
 
             for (auto&& action : action_plan.install_actions)
             {

toolsrc/src/vcpkg/dependencies.cpp

@@ -676,8 +676,7 @@ namespace vcpkg::Dependencies
                                            const CMakeVars::CMakeVarProvider& var_provider,
                                            const std::vector<FullPackageSpec>& specs,
                                            const StatusParagraphs& status_db,
-                                           const CreateInstallPlanOptions& options,
-                                           bool allFeatures)
+                                           const CreateInstallPlanOptions& options)
     {
         PackageGraph pgraph(port_provider, var_provider, status_db);
 
@@ -689,32 +688,14 @@ namespace vcpkg::Dependencies
             Checks::check_exit(
                 VCPKG_LINE_INFO, scfl, "Error: Cannot find definition for package `%s`.", spec.package_spec.name());
 
-            std::vector<std::string> all_features =
+            const std::vector<std::string> all_features =
                 Util::fmap(scfl->source_control_file->feature_paragraphs,
                            [](auto&& feature_paragraph) { return feature_paragraph->name; });
 
             auto fspecs =
                 spec.to_feature_specs(scfl->source_control_file->core_paragraph->default_features, all_features);
             feature_specs.insert(
                 feature_specs.end(), std::make_move_iterator(fspecs.begin()), std::make_move_iterator(fspecs.end()));
-
-            if (allFeatures)
-            {
-                auto feature_list = feature_specs;
-                const auto& features_paragraphs = scfl->source_control_file->feature_paragraphs;
-                PlatformExpression::Context context =
-                    var_provider.get_tag_vars(spec.package_spec).value_or_exit(VCPKG_LINE_INFO);
-
-                for (auto feature = features_paragraphs.begin(); feature != features_paragraphs.end(); feature++)
-                {
-                    if (feature->get()->supports_expression.evaluate(context))
-                    {
-                        // if (find(feature_list.begin(), feature_list.end(), feature->get()->name) ==
-                        // feature_list.end())
-                        feature_specs.emplace_back(spec.package_spec, feature->get()->name);
-                    }
-                }
-            }
         }
         Util::sort_unique_erase(feature_specs);
 

toolsrc/src/vcpkg/sourceparagraph.cpp

@@ -469,6 +469,7 @@ namespace vcpkg
         constexpr static StringLiteral NAME = "name";
         constexpr static StringLiteral DESCRIPTION = "description";
         constexpr static StringLiteral DEPENDENCIES = "dependencies";
+        constexpr static StringLiteral SUPPORTS = "support";
 
         virtual Span<const StringView> valid_fields() const override
         {
@@ -496,6 +497,7 @@ namespace vcpkg
                 DEPENDENCIES,
                 feature->dependencies,
                 Json::ArrayDeserializer<DependencyDeserializer>{"an array of dependencies", Json::AllowEmpty::Yes});
+            r.optional_object_field(obj, SUPPORTS, feature->supports_expression, PlatformExprDeserializer{});
 
             return std::move(feature);
         }
@@ -726,31 +728,11 @@ namespace vcpkg
 
             r.optional_object_field(obj, SUPPORTS, spgh->supports_expression, PlatformExprDeserializer{});
 
-            return dep;
-        }
-    };
-
-    struct FeatureField : Json::VisitorCrtpBase<FeatureField>
-    {
-        using type = std::unique_ptr<FeatureParagraph>;
-        StringView type_name() { return "a feature"; }
-
-        constexpr static StringView NAME = "name";
-        constexpr static StringView DESCRIPTION = "description";
-        constexpr static StringView DEPENDENCIES = "dependencies";
-        constexpr static StringView SUPPORTS = "supports";
-
-        Optional<std::unique_ptr<FeatureParagraph>> visit_object(Json::Reader& r, StringView, const Json::Object& obj)
-        {
-            auto feature = std::make_unique<FeatureParagraph>();
-
-            r.required_object_field(type_name(), obj, NAME, feature->name, IdentifierField{});
-            r.required_object_field(type_name(), obj, DESCRIPTION, feature->description, ParagraphField{});
             r.optional_object_field(obj,
-                                    DEPENDENCIES,
-                                    feature->dependencies,
-                                    ArrayField<DependencyField>{"an array of dependencies", AllowEmpty::Yes});
-            r.optional_object_field(obj, SUPPORTS, feature->supports_expression, PlatformExprField{});
+                                    DEFAULT_FEATURES,
+                                    spgh->default_features,
+                                    Json::ArrayDeserializer<Json::IdentifierDeserializer>{"an array of identifiers",
+                                                                                          Json::AllowEmpty::Yes});
 
             r.optional_object_field(
                 obj,