toolset_t -> Toolset
MODIFY
include/vcpkg_Commands.h
include/vcpkg_Commands.h
@@ -29,7 +29,7 @@ namespace vcpkg::Commands
std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
std::string create_user_troubleshooting_message(const PackageSpec& spec);
- std::wstring make_build_env_cmd(const Triplet& target_triplet, const toolset_t& toolset);
+ std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset);
BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);
void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const vcpkg_paths& paths);

MODIFY
include/vcpkg_paths.h
include/vcpkg_paths.h
namespace vcpkg
{
- struct toolset_t
+ struct Toolset
{
fs::path dumpbin;
fs::path vcvarsall;
@@ -47,12 +47,12 @@ namespace vcpkg
const fs::path& get_cmake_exe() const;
const fs::path& get_git_exe() const;
const fs::path& get_nuget_exe() const;
- const toolset_t& get_toolset() const;
+ const Toolset& get_toolset() const;
private:
Lazy<fs::path> cmake_exe;
Lazy<fs::path> git_exe;
Lazy<fs::path> nuget_exe;
- Lazy<toolset_t> toolset;
+ Lazy<Toolset> toolset;
};
}

MODIFY
src/PostBuildLint.cpp
src/PostBuildLint.cpp
@@ -622,7 +622,7 @@ namespace vcpkg::PostBuildLint
static size_t perform_all_checks_and_return_error_count(const PackageSpec& spec, const vcpkg_paths& paths)
{
// for dumpbin
- const toolset_t& toolset = paths.get_toolset();
+ const Toolset& toolset = paths.get_toolset();
BuildInfo build_info = read_build_info(paths.build_info_file_path(spec));
const fs::path package_dir = paths.package_dir(spec);

MODIFY
src/commands_build.cpp
src/commands_build.cpp
@@ -25,7 +25,7 @@ namespace vcpkg::Commands::Build
std::ofstream(binary_control_file) << bpgh;
}
- std::wstring make_build_env_cmd(const Triplet& target_triplet, const toolset_t& toolset)
+ std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset)
{
return Strings::wformat(LR"("%s" %s >nul 2>&1)",
toolset.vcvarsall.native(),
@@ -49,7 +49,7 @@ namespace vcpkg::Commands::Build
const fs::path& git_exe_path = paths.get_git_exe();
const fs::path ports_cmake_script_path = paths.ports_cmake;
- const toolset_t& toolset = paths.get_toolset();
+ const Toolset& toolset = paths.get_toolset();
const auto cmd_set_environment = make_build_env_cmd(target_triplet, toolset);
const std::wstring cmd_launch_cmake = make_cmake_cmd(cmake_exe_path, ports_cmake_script_path,

MODIFY
src/vcpkg_paths.cpp
src/vcpkg_paths.cpp
@@ -262,7 +262,7 @@ namespace vcpkg
return nullopt;
}
- static toolset_t find_toolset_instance(const vcpkg_paths& paths)
+ static Toolset find_toolset_instance(const vcpkg_paths& paths)
{
const std::vector<std::string> vs2017_installation_instances = get_VS2017_installation_instances(paths);
// Note: this will contain a mix of vcvarsall.bat locations and dumpbin.exe locations.
@@ -331,7 +331,7 @@ namespace vcpkg
Checks::exit_fail(VCPKG_LINE_INFO);
}
- const toolset_t& vcpkg_paths::get_toolset() const
+ const Toolset& vcpkg_paths::get_toolset() const
{
return this->toolset.get_lazy([this]() { return find_toolset_instance(*this); });
}

toolset_t -> Toolset