aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-26 18:38:25 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-26 18:38:25 -0800
commit25b8f25dadcb2af28ae5be2e6d31884ca67f1b26 (patch)
tree1e5dd347780670b00cd1e228794b867fca18b522 /toolsrc/include
parent9eb9eca48766289b6377eb479cd5eb5f3da7441d (diff)
downloadvcpkg-25b8f25dadcb2af28ae5be2e6d31884ca67f1b26.tar.gz
vcpkg-25b8f25dadcb2af28ae5be2e6d31884ca67f1b26.zip
[vcpkg] Initial commit of experimental compressed binary archiving behind a flag
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/vcpkg/binaryparagraph.h4
-rw-r--r--toolsrc/include/vcpkg/build.h1
-rw-r--r--toolsrc/include/vcpkg/globalstate.h1
-rw-r--r--toolsrc/include/vcpkg/vcpkgcmdarguments.h2
4 files changed, 6 insertions, 2 deletions
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<std::string, std::string> 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
/// </summary>
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<bool> debugging;
static std::atomic<bool> feature_packages;
+ static std::atomic<bool> g_binary_caching;
static std::atomic<int> g_init_console_cp;
static std::atomic<int> 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<bool> featurepackages = nullopt;
+ Optional<bool> binarycaching = nullopt;
+
std::string command;
std::vector<std::string> command_arguments;