From 411b4cc8a05eb9ac9944ee009dafece8c3b7445f Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sun, 9 Feb 2020 18:55:49 -0800
Subject: [vcpkg] Remove superfluous BuildPackageConfig struct (#9997)

BuildPackageConfig held essentially the same information as InstallPlanAction, so deduplicate
---
 toolsrc/include/vcpkg/build.h | 45 +++++++++----------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 9d555ae25..67505d8f2 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -16,6 +16,11 @@
 #include <set>
 #include <vector>
 
+namespace vcpkg::Dependencies
+{
+    struct InstallPlanAction;
+}
+
 namespace vcpkg::Build
 {
     namespace Command
@@ -194,41 +199,9 @@ namespace vcpkg::Build
         std::unique_ptr<BinaryControlFile> binary_control_file;
     };
 
-    struct BuildPackageConfig
-    {
-        BuildPackageConfig(const SourceControlFileLocation& scfl,
-                           Triplet triplet,
-                           const BuildPackageOptions& build_package_options,
-                           const CMakeVars::CMakeVarProvider& var_provider,
-                           const std::unordered_map<std::string, std::vector<FeatureSpec>>& feature_dependencies,
-                           const std::vector<PackageSpec>& package_dependencies,
-                           const std::vector<std::string>& feature_list)
-            : scfl(scfl)
-            , scf(*scfl.source_control_file)
-            , triplet(triplet)
-            , port_dir(scfl.source_location)
-            , build_package_options(build_package_options)
-            , var_provider(var_provider)
-            , feature_dependencies(feature_dependencies)
-            , package_dependencies(package_dependencies)
-            , feature_list(feature_list)
-        {
-        }
-
-        const SourceControlFileLocation& scfl;
-        const SourceControlFile& scf;
-        Triplet triplet;
-        const fs::path& port_dir;
-        const BuildPackageOptions& build_package_options;
-        const CMakeVars::CMakeVarProvider& var_provider;
-
-        const std::unordered_map<std::string, std::vector<FeatureSpec>>& feature_dependencies;
-        const std::vector<PackageSpec>& package_dependencies;
-        const std::vector<std::string>& feature_list;
-    };
-
     ExtendedBuildResult build_package(const VcpkgPaths& paths,
-                                      const BuildPackageConfig& config,
+                                      const Dependencies::InstallPlanAction& config,
+                                      const CMakeVars::CMakeVarProvider& var_provider,
                                       const StatusParagraphs& status_db);
 
     enum class BuildPolicy
@@ -253,7 +226,7 @@ namespace vcpkg::Build
         BuildPolicy::EMPTY_INCLUDE_FOLDER,
         BuildPolicy::ALLOW_OBSOLETE_MSVCRT,
         BuildPolicy::ALLOW_RESTRICTED_HEADERS,
-        BuildPolicy::SKIP_DUMPBIN_CHECKS
+        BuildPolicy::SKIP_DUMPBIN_CHECKS,
     };
 
     const std::string& to_string(BuildPolicy policy);
@@ -316,7 +289,7 @@ namespace vcpkg::Build
     };
 
     Optional<AbiTagAndFile> compute_abi_tag(const VcpkgPaths& paths,
-                                            const BuildPackageConfig& config,
+                                            const Dependencies::InstallPlanAction& config,
                                             const PreBuildInfo& pre_build_info,
                                             Span<const AbiEntry> dependency_abis);
 }
-- 
cgit v1.2.3