From 25b8f25dadcb2af28ae5be2e6d31884ca67f1b26 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 26 Feb 2018 18:38:25 -0800 Subject: [vcpkg] Initial commit of experimental compressed binary archiving behind a flag --- toolsrc/include/vcpkg/binaryparagraph.h | 4 ++-- toolsrc/include/vcpkg/build.h | 1 + toolsrc/include/vcpkg/globalstate.h | 1 + toolsrc/include/vcpkg/vcpkgcmdarguments.h | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg/binaryparagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h index f59bf693a..3315151c6 100644 --- a/toolsrc/include/vcpkg/binaryparagraph.h +++ b/toolsrc/include/vcpkg/binaryparagraph.h @@ -14,7 +14,7 @@ namespace vcpkg { BinaryParagraph(); explicit BinaryParagraph(std::unordered_map fields); - BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet); + BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet, const std::string& abi_tag); BinaryParagraph(const SourceParagraph& spgh, const FeatureParagraph& fpgh, const Triplet& triplet); std::string displayname() const; @@ -40,4 +40,4 @@ namespace vcpkg }; void serialize(const BinaryParagraph& pgh, std::string& out_str); -} \ No newline at end of file +} diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index f560dbf57..ea81c4dbe 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -98,6 +98,7 @@ namespace vcpkg::Build /// static PreBuildInfo from_triplet_file(const VcpkgPaths& paths, const Triplet& triplet); + std::string triplet_abi_tag; std::string target_architecture; std::string cmake_system_name; std::string cmake_system_version; diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h index 360d3f43e..bc28e3ff8 100644 --- a/toolsrc/include/vcpkg/globalstate.h +++ b/toolsrc/include/vcpkg/globalstate.h @@ -14,6 +14,7 @@ namespace vcpkg static std::atomic debugging; static std::atomic feature_packages; + static std::atomic g_binary_caching; static std::atomic g_init_console_cp; static std::atomic g_init_console_output_cp; diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index bce22b6f9..f449887f1 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -81,6 +81,8 @@ namespace vcpkg // feature flags Optional featurepackages = nullopt; + Optional binarycaching = nullopt; + std::string command; std::vector command_arguments; -- cgit v1.2.3