aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-10-18 19:04:14 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-10-18 19:04:37 -0700
commitecdfd3c8e3a4b924bfad5b70f6557dd9f337bd1c (patch)
tree1c397551c2968264ec43983270a3bc5b3b36e17e /toolsrc/include
parentbc9dcad2e6bae7a31e5fcc59380b64d8768504db (diff)
downloadvcpkg-ecdfd3c8e3a4b924bfad5b70f6557dd9f337bd1c.tar.gz
vcpkg-ecdfd3c8e3a4b924bfad5b70f6557dd9f337bd1c.zip
ci now accepts multiple triplets. Refactoring to accomodate
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/vcpkg/install.h28
1 files changed, 18 insertions, 10 deletions
diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h
index db6055f4f..809befb16 100644
--- a/toolsrc/include/vcpkg/install.h
+++ b/toolsrc/include/vcpkg/install.h
@@ -17,13 +17,22 @@ namespace vcpkg::Install
inline KeepGoing to_keep_going(const bool value) { return value ? KeepGoing::YES : KeepGoing::NO; }
- enum class PrintSummary
+ struct SpecSummary
{
- NO = 0,
- YES
+ explicit SpecSummary(const PackageSpec& spec);
+
+ PackageSpec spec;
+ Build::BuildResult result;
+ std::string timing;
};
- inline PrintSummary to_print_summary(const bool value) { return value ? PrintSummary::YES : PrintSummary::NO; }
+ struct InstallSummary
+ {
+ std::vector<SpecSummary> results;
+ std::string total_elapsed_time;
+
+ void print() const;
+ };
struct InstallDir
{
@@ -58,12 +67,11 @@ namespace vcpkg::Install
const BinaryControlFile& binary_paragraph,
StatusParagraphs* status_db);
- void perform_and_exit_ex(const std::vector<Dependencies::AnyAction>& action_plan,
- const Build::BuildPackageOptions& install_plan_options,
- const KeepGoing keep_going,
- const PrintSummary print_summary,
- const VcpkgPaths& paths,
- StatusParagraphs& status_db);
+ InstallSummary perform(const std::vector<Dependencies::AnyAction>& action_plan,
+ const Build::BuildPackageOptions& install_plan_options,
+ const KeepGoing keep_going,
+ const VcpkgPaths& paths,
+ StatusParagraphs& status_db);
extern const CommandStructure COMMAND_STRUCTURE;