[vcpkg] Portfile Settings (#7292)

4 files changed, 59 insertions, 39 deletions

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index e26597376..f4cd3b0ef 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -117,29 +117,6 @@ namespace vcpkg::Build
     std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
     std::string create_user_troubleshooting_message(const PackageSpec& spec);
 
-   enum class VcpkgTripletVar
-   {
-       TARGET_ARCHITECTURE = 0,
-       CMAKE_SYSTEM_NAME,
-       CMAKE_SYSTEM_VERSION,
-       PLATFORM_TOOLSET,
-       VISUAL_STUDIO_PATH,
-       CHAINLOAD_TOOLCHAIN_FILE,
-       BUILD_TYPE,
-       ENV_PASSTHROUGH,
-   };
-
-   const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = {
-       {"VCPKG_TARGET_ARCHITECTURE", VcpkgTripletVar::TARGET_ARCHITECTURE},
-       {"VCPKG_CMAKE_SYSTEM_NAME", VcpkgTripletVar::CMAKE_SYSTEM_NAME},
-       {"VCPKG_CMAKE_SYSTEM_VERSION", VcpkgTripletVar::CMAKE_SYSTEM_VERSION},
-       {"VCPKG_PLATFORM_TOOLSET", VcpkgTripletVar::PLATFORM_TOOLSET},
-       {"VCPKG_VISUAL_STUDIO_PATH", VcpkgTripletVar::VISUAL_STUDIO_PATH},
-       {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE},
-       {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE},
-       {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH},
-   };
-
     /// <summary>
     /// Settings from the triplet file which impact the build environment and post-build checks
     /// </summary>
@@ -148,7 +125,9 @@ namespace vcpkg::Build
         /// <summary>
         /// Runs the triplet file in a "capture" mode to create a PreBuildInfo
         /// </summary>
-        static PreBuildInfo from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet);
+        static PreBuildInfo from_triplet_file(const VcpkgPaths& paths,
+                const Triplet& triplet,
+                Optional<const SourceControlFileLocation&> port = nullopt);
 
         std::string triplet_abi_tag;
         std::string target_architecture;
@@ -163,6 +142,29 @@ namespace vcpkg::Build
 
     std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
 
+    enum class VcpkgTripletVar
+    {
+        TARGET_ARCHITECTURE = 0,
+        CMAKE_SYSTEM_NAME,
+        CMAKE_SYSTEM_VERSION,
+        PLATFORM_TOOLSET,
+        VISUAL_STUDIO_PATH,
+        CHAINLOAD_TOOLCHAIN_FILE,
+        BUILD_TYPE,
+        ENV_PASSTHROUGH,
+    };
+
+    const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = {
+        {"VCPKG_TARGET_ARCHITECTURE", VcpkgTripletVar::TARGET_ARCHITECTURE},
+        {"VCPKG_CMAKE_SYSTEM_NAME", VcpkgTripletVar::CMAKE_SYSTEM_NAME},
+        {"VCPKG_CMAKE_SYSTEM_VERSION", VcpkgTripletVar::CMAKE_SYSTEM_VERSION},
+        {"VCPKG_PLATFORM_TOOLSET", VcpkgTripletVar::PLATFORM_TOOLSET},
+        {"VCPKG_VISUAL_STUDIO_PATH", VcpkgTripletVar::VISUAL_STUDIO_PATH},
+        {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE},
+        {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE},
+        {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH},
+    };
+
     struct ExtendedBuildResult
     {
         ExtendedBuildResult(BuildResult code);
@@ -176,19 +178,20 @@ namespace vcpkg::Build
 
     struct BuildPackageConfig
     {
-        BuildPackageConfig(const SourceControlFile& src,
+        BuildPackageConfig(const SourceControlFileLocation& scfl,
                            const Triplet& triplet,
-                           fs::path&& port_dir,
                            const BuildPackageOptions& build_package_options,
                            const std::set<std::string>& feature_list)
-            : scf(src)
+            : scfl(scfl)
+            , scf(*scfl.source_control_file)
             , triplet(triplet)
-            , port_dir(std::move(port_dir))
+            , port_dir(scfl.source_location)
             , build_package_options(build_package_options)
             , feature_list(feature_list)
         {
         }
 
+        const SourceControlFileLocation& scfl;
         const SourceControlFile& scf;
         const Triplet& triplet;
         fs::path port_dir;
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index 2f58a3341..b99f300d3 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -64,7 +64,7 @@ namespace vcpkg::Build::Command
         features_as_set.emplace("core");

 

         const Build::BuildPackageConfig build_config{

-            scf, spec.triplet(), fs::path(scfl.source_location), build_package_options, features_as_set};

+            scfl, spec.triplet(), build_package_options, features_as_set};

 

         const auto build_timer = Chrono::ElapsedTimer::create_started();

         const auto result = Build::build_package(paths, build_config, status_db);

@@ -402,6 +402,7 @@ namespace vcpkg::Build
             {"CURRENT_PORT_DIR", config.port_dir},

             {"TARGET_TRIPLET", triplet.canonical_name()},

             {"TARGET_TRIPLET_FILE", paths.get_triplet_file_path(triplet).u8string()},

+            {"ENV_OVERRIDES_FILE", config.port_dir / "environment-overrides.cmake"},

             {"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},

             {"VCPKG_USE_HEAD_VERSION", Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},

             {"DOWNLOADS", paths.downloads},

@@ -783,7 +784,8 @@ namespace vcpkg::Build
                 AbiEntry{status_it->get()->package.spec.name(), status_it->get()->package.abi});

         }

 

-        const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet);

+        const auto pre_build_info =

+            PreBuildInfo::from_triplet_file(paths, triplet, config.scfl);

 

         auto maybe_abi_tag_and_file = compute_abi_tag(paths, config, pre_build_info, dependency_abis);

 

@@ -998,7 +1000,9 @@ namespace vcpkg::Build
         return inner_create_buildinfo(*pghs.get());

     }

 

-    PreBuildInfo PreBuildInfo::from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet)

+    PreBuildInfo PreBuildInfo::from_triplet_file(const VcpkgPaths& paths,

+                                                 const Triplet& triplet,

+                                                 Optional<const SourceControlFileLocation&> port)

     {

         static constexpr CStringView FLAG_GUID = "c35112b6-d1ba-415b-aa5d-81de856ef8eb";

 

@@ -1006,11 +1010,19 @@ namespace vcpkg::Build
         const fs::path ports_cmake_script_path = paths.scripts / "get_triplet_environment.cmake";

         const fs::path triplet_file_path = paths.get_triplet_file_path(triplet);

 

+        std::vector<System::CMakeVariable> args{{"CMAKE_TRIPLET_FILE", triplet_file_path}};

+

+        if (port)

+        {

+            args.emplace_back(

+                    "CMAKE_ENV_OVERRIDES_FILE",

+                    port.value_or_exit(VCPKG_LINE_INFO).source_location / "environment-overrides.cmake");

+        }

+

         const auto cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path,

                                                              ports_cmake_script_path,

-                                                             {

-                                                                 {"CMAKE_TRIPLET_FILE", triplet_file_path},

-                                                             });

+                                                             args);

+

         const auto ec_data = System::cmd_execute_and_capture_output(cmd_launch_cmake);

         Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, ec_data.output);

 

diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index c12c26ff7..b4290baab 100644
--- a/toolsrc/src/vcpkg/commands.ci.cpp
+++ b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -237,9 +237,8 @@ namespace vcpkg::Commands::CI
                     auto triplet = p->spec.triplet();
 
                     const Build::BuildPackageConfig build_config{
-                        *scfl->source_control_file, 
+                        *scfl,
                         triplet, 
-                        static_cast<fs::path>(scfl->source_location), 
                         build_options, 
                         p->feature_list
                     };
@@ -254,7 +253,14 @@ namespace vcpkg::Commands::CI
                                 return {spec.name(), it->second};
                         });
                     const auto& pre_build_info = pre_build_info_cache.get_lazy(
-                        triplet, [&]() { return Build::PreBuildInfo::from_triplet_file(paths, triplet); });
+                        triplet,
+                        [&]() {
+                            return Build::PreBuildInfo::from_triplet_file(
+                                    paths,
+                                    triplet,
+                                    *scfl);
+                        }
+                    );
 
                     auto maybe_tag_and_file =
                         Build::compute_abi_tag(paths, build_config, pre_build_info, dependency_abis);
diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp
index de19c360a..425a4cdbc 100644
--- a/toolsrc/src/vcpkg/install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -331,9 +331,8 @@ namespace vcpkg::Install
 
             auto result = [&]() -> Build::ExtendedBuildResult {
                 const auto& scfl = action.source_control_file_location.value_or_exit(VCPKG_LINE_INFO);
-                const Build::BuildPackageConfig build_config{*scfl.source_control_file,
+                const Build::BuildPackageConfig build_config{scfl,
                                                              action.spec.triplet(),
-                                                             static_cast<fs::path>(scfl.source_location),
                                                              action.build_options,
                                                              action.feature_list};
                 return Build::build_package(paths, build_config, status_db);