From f10861fa7af9bd675cb4e80ea31d85d7e5c6d906 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 2 May 2017 17:52:59 -0700 Subject: [vcpkg] Reduce arguments to build_package() by bundling --- toolsrc/include/PackageSpec.h | 2 +- toolsrc/include/vcpkg_Build.h | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 8f1d8cfc5..050d9d079 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -8,7 +8,7 @@ namespace vcpkg struct PackageSpec { static Expected from_string(const std::string& spec_as_string, const Triplet& default_triplet); - + static std::string to_string(const std::string& name, const Triplet& triplet); static Expected from_name_and_triplet(const std::string& name, const Triplet& triplet); const std::string& name() const; diff --git a/toolsrc/include/vcpkg_Build.h b/toolsrc/include/vcpkg_Build.h index f4b9300c5..eec98d861 100644 --- a/toolsrc/include/vcpkg_Build.h +++ b/toolsrc/include/vcpkg_Build.h @@ -40,10 +40,20 @@ namespace vcpkg::Build std::vector unmet_dependencies; }; - ExtendedBuildResult build_package(const SourceParagraph& source_paragraph, - const PackageSpec& spec, - const VcpkgPaths& paths, - const fs::path& port_dir, + struct BuildPackageConfig + { + BuildPackageConfig(const SourceParagraph& src, const Triplet& triplet, fs::path&& port_dir) + : src(src), triplet(triplet), port_dir(std::move(port_dir)), use_head_version(false), no_downloads(false) + { + } + + const SourceParagraph& src; + const Triplet& triplet; + fs::path port_dir; + }; + + ExtendedBuildResult build_package(const VcpkgPaths& paths, + const BuildPackageConfig& config, const StatusParagraphs& status_db); struct BuildInfo -- cgit v1.2.3