Allow features with platform expressions

docs/vcpkg-schema-definitions.schema.json

@@ -211,7 +211,7 @@
         "features": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/identifier"
+            "$ref": "#/definitions/dependency-feature"
           }
         },
         "host": {
@@ -239,6 +239,33 @@
       },
       "additionalProperties": false
     },
+    "dependency-feature-object": {
+      "description": "Expanded form of a dependency feature with platform expression.",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/identifier"
+        },
+        "platform": {
+          "$ref": "#/definitions/platform-expression"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
+    "dependency-feature": {
+      "description": "A feature",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/identifier"
+        },
+        {
+          "$ref": "#/definitions/dependency-feature-object"
+        }
+      ]
+    },
     "description-field": {
       "description": "A string or array of strings containing the description of a package or feature.",
       "$ref": "#/definitions/string-or-strings"

docs/vcpkg.schema.json

@@ -84,7 +84,7 @@
           "description": "Features enabled by default with the package.",
           "type": "array",
           "items": {
-            "$ref": "vcpkg-schema-definitions.schema.json#/definitions/identifier"
+            "$ref": "vcpkg-schema-definitions.schema.json#/definitions/dependency-feature"
           }
         },
         "supports": {

include/vcpkg/base/message-data.inc.h

@@ -4,6 +4,7 @@ DECLARE_MESSAGE(ABoolean, (), "", "a boolean")
 DECLARE_MESSAGE(ABuiltinRegistry, (), "", "a builtin registry")
 DECLARE_MESSAGE(AConfigurationObject, (), "", "a configuration object")
 DECLARE_MESSAGE(ADependency, (), "", "a dependency")
+DECLARE_MESSAGE(ADependencyFeature, (), "", "a feature in a dependency")
 DECLARE_MESSAGE(ADemandObject,
                 (),
                 "'demands' are a concept in the schema of a JSON file the user can edit",
@@ -124,6 +125,7 @@ DECLARE_MESSAGE(AnArtifactsGitRegistryUrl, (), "", "an artifacts git registry UR
 DECLARE_MESSAGE(AnArtifactsRegistry, (), "", "an artifacts registry")
 DECLARE_MESSAGE(AnArrayOfDependencies, (), "", "an array of dependencies")
 DECLARE_MESSAGE(AnArrayOfDependencyOverrides, (), "", "an array of dependency overrides")
+DECLARE_MESSAGE(AnArrayOfFeatures, (), "", "an array of features")
 DECLARE_MESSAGE(AnArrayOfIdentifers, (), "", "an array of identifiers")
 DECLARE_MESSAGE(AnArrayOfOverlayPaths, (), "", "an array of overlay paths")
 DECLARE_MESSAGE(AnArrayOfOverlayTripletsPaths, (), "", "an array of overlay triplets paths")

include/vcpkg/binaryparagraph.h

@@ -14,6 +14,7 @@ namespace vcpkg
         BinaryParagraph();
         explicit BinaryParagraph(Paragraph fields);
         BinaryParagraph(const SourceParagraph& spgh,
+                        const std::vector<std::string>& default_features,
                         Triplet triplet,
                         const std::string& abi_tag,
                         std::vector<PackageSpec> deps);

include/vcpkg/dependencies.h

@@ -70,7 +70,8 @@ namespace vcpkg
                           const RequestType& request_type,
                           Triplet host_triplet,
                           std::map<std::string, std::vector<FeatureSpec>>&& dependencies,
-                          std::vector<LocalizedString>&& build_failure_messages);
+                          std::vector<LocalizedString>&& build_failure_messages,
+                          std::vector<std::string> default_features);
 
         const std::string& public_abi() const;
         bool has_package_abi() const;
@@ -80,6 +81,7 @@ namespace vcpkg
 
         Optional<const SourceControlFileAndLocation&> source_control_file_and_location;
         Optional<InstalledPackageView> installed_package;
+        Optional<std::vector<std::string>> default_features;
 
         InstallPlanType plan_type;
         RequestType request_type;

include/vcpkg/sourceparagraph.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/fwd/configuration.h>
+#include <vcpkg/fwd/packagespec.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 
 #include <vcpkg/base/expected.h>
@@ -36,18 +37,39 @@ namespace vcpkg
         Optional<Version> try_get_minimum_version() const;
     };
 
+    struct DependencyRequestedFeature
+    {
+        std::string name;
+        PlatformExpression::Expr platform;
+        DependencyRequestedFeature(std::string name)
+            : DependencyRequestedFeature(std::move(name), PlatformExpression::Expr::Empty())
+        {
+        }
+        DependencyRequestedFeature(std::string name, PlatformExpression::Expr platform)
+            : name(std::move(name)), platform(std::move(platform))
+        {
+            Checks::check_exit(VCPKG_LINE_INFO, !this->name.empty() && this->name != "core" && this->name != "default");
+        }
+        friend bool operator==(const DependencyRequestedFeature& lhs, const DependencyRequestedFeature& rhs);
+        friend bool operator!=(const DependencyRequestedFeature& lhs, const DependencyRequestedFeature& rhs);
+    };
+
     struct Dependency
     {
         std::string name;
-        std::vector<std::string> features;
+        // a list of "real" features without "core" or "default". Use member default_features instead.
+        std::vector<DependencyRequestedFeature> features;
         PlatformExpression::Expr platform;
         DependencyConstraint constraint;
         bool host = false;
 
+        bool default_features = true;
+        bool has_platform_expressions() const;
+
         Json::Object extra_info;
 
-        /// @param id adds "default" if "core" not present.
-        FullPackageSpec to_full_spec(Triplet target, Triplet host, ImplicitDefault id) const;
+        /// @param id adds "default" if `default_features` is false.
+        FullPackageSpec to_full_spec(View<std::string> features, Triplet target, Triplet host) const;
 
         friend bool operator==(const Dependency& lhs, const Dependency& rhs);
         friend bool operator!=(const Dependency& lhs, const Dependency& rhs) { return !(lhs == rhs); }
@@ -69,8 +91,7 @@ namespace vcpkg
     std::vector<FullPackageSpec> filter_dependencies(const std::vector<Dependency>& deps,
                                                      Triplet t,
                                                      Triplet host,
-                                                     const std::unordered_map<std::string, std::string>& cmake_vars,
-                                                     ImplicitDefault id);
+                                                     const std::unordered_map<std::string, std::string>& cmake_vars);
 
     /// <summary>
     /// Port metadata of additional feature in a package (part of CONTROL file)
@@ -108,7 +129,7 @@ namespace vcpkg
         std::string documentation;
         std::vector<Dependency> dependencies;
         std::vector<DependencyOverride> overrides;
-        std::vector<std::string> default_features;
+        std::vector<DependencyRequestedFeature> default_features;
 
         // there are two distinct "empty" states here
         // "user did not provide a license" -> nullopt

locales/messages.json

@@ -8,6 +8,7 @@
   "ADemandObject": "a demand object",
   "_ADemandObject.comment": "'demands' are a concept in the schema of a JSON file the user can edit",
   "ADependency": "a dependency",
+  "ADependencyFeature": "a feature in a dependency",
   "ADictionaryOfContacts": "a dictionary of contacts",
   "AFeature": "a feature",
   "AFilesystemRegistry": "a filesystem registry",
@@ -115,6 +116,7 @@
   "_AmbiguousConfigDeleteConfigFile.comment": "An example of {path} is /foo/bar.",
   "AnArrayOfDependencies": "an array of dependencies",
   "AnArrayOfDependencyOverrides": "an array of dependency overrides",
+  "AnArrayOfFeatures": "an array of features",
   "AnArrayOfIdentifers": "an array of identifiers",
   "AnArrayOfOverlayPaths": "an array of overlay paths",
   "AnArrayOfOverlayTripletsPaths": "an array of overlay triplets paths",

src/vcpkg-test/binarycaching.cpp

@@ -227,6 +227,7 @@ Build-Depends: bzip
                           RequestType::USER_REQUESTED,
                           Test::ARM_UWP,
                           {{"a", {}}, {"b", {}}},
+                          {},
                           {});
 
     ipa.abi_info = AbiInfo{};
@@ -352,7 +353,8 @@ Version: 1.5
                               RequestType::USER_REQUESTED,
                               Test::ARM_UWP,
                               std::map<std::string, std::vector<FeatureSpec>>{},
-                              std::vector<LocalizedString>{});
+                              std::vector<LocalizedString>{},
+                              std::vector<std::string>{});
     InstallPlanAction& ipa_without_abi = install_plan.back();
     ipa_without_abi.package_dir = "pkgs/someheadpackage";
 
@@ -428,7 +430,8 @@ Description: a spiffy compression library wrapper
                                       RequestType::USER_REQUESTED,
                                       Test::ARM64_WINDOWS,
                                       std::map<std::string, std::vector<FeatureSpec>>{},
-                                      std::vector<LocalizedString>{});
+                                      std::vector<LocalizedString>{},
+                                      std::vector<std::string>{});
     plan.install_actions[0].abi_info = AbiInfo{};
     plan.install_actions[0].abi_info.get()->package_abi = "packageabi";
 
@@ -455,7 +458,8 @@ Description: a spiffy compression library wrapper
                                       RequestType::USER_REQUESTED,
                                       Test::ARM64_WINDOWS,
                                       std::map<std::string, std::vector<FeatureSpec>>{},
-                                      std::vector<LocalizedString>{});
+                                      std::vector<LocalizedString>{},
+                                      std::vector<std::string>{});
     plan.install_actions[1].abi_info = AbiInfo{};
     plan.install_actions[1].abi_info.get()->package_abi = "packageabi2";