Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] Add support for VCPKG_BINARY_SOURCES and --x-binarysource=<> #10476

Merged

Conversation

ras0219-msft
Copy link
Contributor

No description provided.

@ras0219-msft ras0219-msft added the info:internal This PR or Issue was filed by the vcpkg team. label Mar 20, 2020
@ras0219-msft ras0219-msft self-assigned this Mar 20, 2020
@ras0219-msft ras0219-msft changed the title [vcpkg] Add support for VCPKG_BINARY_SOURCES and --binarysource=<> [vcpkg] Add support for VCPKG_BINARY_SOURCES and --x-binarysource=<> Mar 23, 2020
@ras0219-msft ras0219-msft requested a review from BillyONeal March 23, 2020 20:22
toolsrc/src/vcpkg/build.cpp Show resolved Hide resolved
toolsrc/src/vcpkg/build.cpp Show resolved Hide resolved
toolsrc/src/vcpkg/vcpkgcmdarguments.cpp Outdated Show resolved Hide resolved
@@ -170,6 +185,12 @@ namespace vcpkg
arg.substr(sizeof("--overlay-triplets=") - 1), "--overlay-triplets", args.overlay_triplets);
continue;
}
if (Strings::starts_with(arg, "--x-binarysource="))
{
parse_cojoined_multivalue(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

substr in this role fills me with sadness but it's consistent with the rest of the code here so feel free to ignore

toolsrc/src/vcpkg/binarycaching.cpp Outdated Show resolved Hide resolved
toolsrc/src/vcpkg/binarycaching.cpp Show resolved Hide resolved
toolsrc/src/vcpkg/binarycaching.cpp Show resolved Hide resolved
toolsrc/src/vcpkg/binarycaching.cpp Show resolved Hide resolved
{
if (log_file.path().extension() == ".log")
// Build failed, store all failure logs in the tombstone.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extract "store tombstone" function rather than commenting?

toolsrc/src/vcpkg/binarycaching.cpp Outdated Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Pull request contains merge conflicts.

@cbezault
Copy link
Contributor

So what does this PR do? Is the design goal to let you point to another directory for cached binaries?

@cbezault cbezault added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Apr 28, 2020
@ras0219-msft
Copy link
Contributor Author

Yeah, it enables some configurability for where to look for binaries as well as multi-source and read-only behavior.

@ras0219-msft ras0219-msft merged commit ce8b01a into microsoft:master Apr 29, 2020
strega-nil pushed a commit to strega-nil/vcpkg that referenced this pull request May 5, 2021
…icrosoft#10476)

* [vcpkg] Add support for VCPKG_BINARY_SOURCES and --binarysource=<>

* [vcpkg] Rename --binarysource to --x-binarysource to denote internal/experimental

* [vcpkg] Address review comments & add tests for BinaryConfigParser

* [vcpkg] Replace do {} while(1); with for(;;)

Avoids conditional expresion is constant warnings

* [vcpkg] Invert if/else

* [vcpkg] Fix warning in export.prefab.cpp

* [vcpkg] Resolve merge regressions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants