From ee0201cfae196c175d58064b2e62a91c033ec038 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sun, 23 Apr 2017 01:30:43 -0700 Subject: [vcpkg-build] Fix regression in build command. Missing dependencies were not being computed correctly after the internal call to build failed. Solution is to return the already-computed list from build. --- toolsrc/include/vcpkg_Commands.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 68689bf1e..4c1970219 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -31,8 +31,25 @@ namespace vcpkg::Commands std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset); - BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& 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& options, const VcpkgPaths& paths); + struct ExtendedBuildResult + { + BuildResult code; + std::vector unmet_dependencies; + }; + + ExtendedBuildResult build_package( + const SourceParagraph& source_paragraph, + const PackageSpec& spec, + const VcpkgPaths& 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& options, + const VcpkgPaths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } -- cgit v1.2.3