diff options
| author | Curtis.Bezault <curtbezault@gmail.com> | 2019-07-23 10:07:39 -0700 |
|---|---|---|
| committer | Curtis.Bezault <curtbezault@gmail.com> | 2019-07-23 10:07:39 -0700 |
| commit | 459908ae14458a615bb0a8c278c799cabd34e558 (patch) | |
| tree | 2ef9163ac2dda5ef5624c96f814dd6f373f96351 /toolsrc/include | |
| parent | d39bd70d533c64e929d4399cb9a1bdbfe0efaecd (diff) | |
| download | vcpkg-459908ae14458a615bb0a8c278c799cabd34e558.tar.gz vcpkg-459908ae14458a615bb0a8c278c799cabd34e558.zip | |
add external file hashes to the binary paragraph
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/binaryparagraph.h | 1 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/include/vcpkg/binaryparagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h index fa49edaba..ec14f8a97 100644 --- a/toolsrc/include/vcpkg/binaryparagraph.h +++ b/toolsrc/include/vcpkg/binaryparagraph.h @@ -32,6 +32,7 @@ namespace vcpkg std::vector<std::string> depends; std::string abi; SourceParagraph::TYPE type; + std::unordered_map<std::string, std::string> external_files; }; struct BinaryControlFile diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index 85d6ebed9..5b52f436f 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -138,7 +138,7 @@ namespace vcpkg::Build Optional<std::string> external_toolchain_file; Optional<ConfigurationType> build_type; std::vector<std::string> passthrough_env_vars; - std::vector<fs::path> additional_files; + std::vector<std::pair<std::string, std::string>> external_files; }; std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); @@ -153,7 +153,7 @@ namespace vcpkg::Build CHAINLOAD_TOOLCHAIN_FILE, BUILD_TYPE, ENV_PASSTHROUGH, - ABI_ADDITIONAL_FILES, + EXTERNAL_FILES, }; const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = { @@ -165,7 +165,7 @@ namespace vcpkg::Build {"VCPKG_CHAINLOAD_TOOLCHAIN_FILE", VcpkgTripletVar::CHAINLOAD_TOOLCHAIN_FILE}, {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE}, {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH}, - {"VCPKG_ABI_ADDITIONAL_FILES", VcpkgTripletVar::ABI_ADDITIONAL_FILES}, + {"VCPKG_EXTERNAL_FILES", VcpkgTripletVar::EXTERNAL_FILES}, }; struct ExtendedBuildResult |