wip

azure-pipelines/e2e-ports/vcpkg-license-bsd-feature/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-bsd-feature/vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "name": "vcpkg-license-bsd-feature",
+  "version": "0",
+  "features": {
+    "enable-license": {
+      "description": "Enable license",
+      "license": "BSD-3-Clause"
+    }
+  }
+}

azure-pipelines/e2e-ports/vcpkg-license-bsd-on-mit-feature/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-bsd-on-mit-feature/vcpkg.json

@@ -0,0 +1,13 @@
+{
+  "name": "vcpkg-license-bsd-on-mit-feature",
+  "version": "0",
+  "license": "BSD-3-Clause",
+  "features": {
+    "enable-license": {
+      "description": "Enable license",
+      "dependencies": [
+        "vcpkg-license-mit-feature"
+      ]
+    }
+  }
+}

azure-pipelines/e2e-ports/vcpkg-license-mit-feature/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-mit-feature/vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "name": "vcpkg-license-mit-feature",
+  "version": "0",
+  "features": {
+    "enable-license": {
+      "description": "Enable license",
+      "license": "MIT"
+    }
+  }
+}

azure-pipelines/e2e-ports/vcpkg-license-null-feature/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-null-feature/vcpkg.json

@@ -0,0 +1,10 @@
+{
+  "name": "vcpkg-license-null-feature",
+  "version": "0",
+  "features": {
+    "enable-license": {
+      "description": "Enable license",
+      "license": null
+    }
+  }
+}

src/vcpkg/commands.install.cpp

@@ -573,6 +573,32 @@ namespace vcpkg
         }
     }
 
+    static void add_licenses(LicenseReport& report, const SourceControlFileAndLocation* scfl)
+    {
+        if (!scfl)
+        {
+            return;
+        }
+
+        auto scf = scfl->source_control_file.get();
+        if (auto license = scf->core_paragraph->license.get())
+        {
+            report.named_licenses.insert(*license);
+        }
+        else
+        {
+            report.any_unknown_licenses = true;
+        }
+
+        for (auto&& feature : scf->feature_paragraphs)
+        {
+            if (auto license = feature->license.get())
+            {
+                report.named_licenses.insert(*license);
+            }
+        }
+    }
+
     InstallSummary install_execute_plan(const VcpkgCmdArguments& args,
                                         const VcpkgPaths& paths,
                                         Triplet host_triplet,
@@ -609,17 +635,7 @@ namespace vcpkg
                 args, paths, host_triplet, build_options, action, status_db, binary_cache, build_logs_recorder);
             if (result.code == BuildResult::Succeeded)
             {
-                if (auto scfl = action.source_control_file_and_location.get())
-                {
-                    if (auto license = scfl->source_control_file->core_paragraph->license.get())
-                    {
-                        summary.license_report.named_licenses.insert(*license);
-                    }
-                    else
-                    {
-                        summary.license_report.any_unknown_licenses = true;
-                    }
-                }
+                add_licenses(summary.license_report, action.source_control_file_and_location.get());
             }
             else
             {

src/vcpkg/spdx.cpp

@@ -189,6 +189,8 @@ namespace vcpkg
             {
                 obj.insert(JsonIdHomepage, cpgh.homepage);
             }
+
+            // FIXME this needs to consider features
             obj.insert(SpdxLicenseConcluded, conclude_license(cpgh.license));
             obj.insert(SpdxLicenseDeclared, SpdxNoAssertion);
             obj.insert(SpdxCopyrightText, SpdxNoAssertion);