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

Configuring overlay ports and overlay triplets through the manifest #743

Merged
merged 30 commits into from
Oct 20, 2022

Conversation

valeriaconde
Copy link
Contributor

@valeriaconde valeriaconde commented Oct 10, 2022

@valeriaconde
Copy link
Contributor Author

@microsoft-github-policy-service agree [company="microsoft"]

@valeriaconde
Copy link
Contributor Author

@microsoft-github-policy-service agree company="microsoft"

@autoantwort
Copy link
Contributor

Currently relative paths are relative to the CWD and not to the manifest root. And I guess e2e test will come to test relative paths in manifest file and manifest root != CWD.

I really like this change 👍

@Neumann-A
Copy link
Contributor

The only issue I have with adding this stuff into the manifest is that the manifest becomes kind of a configuration file for vcpkg instead of a clean dependency definition. Maybe vcpkg should add a new differentiation and add a vcpkg-project.json instead of calling everything vcpkg.json

@BillyONeal
Copy link
Member

The only issue I have with adding this stuff into the manifest is that the manifest becomes kind of a configuration file for vcpkg instead of a clean dependency definition. Maybe vcpkg should add a new differentiation and add a vcpkg-project.json instead of calling everything vcpkg.json

That is, vcpkg-configuration.json, where the registries definitions already live. That makes sense to me...

@BillyONeal
Copy link
Member

That is, vcpkg-configuration.json, where the registries definitions already live. That makes sense to me...

Wait, that's what this PR already does. @Neumann-A I think the "vcpkg.json is the durable/transitive declaration of dependencies" is unaffected here.

@Neumann-A
Copy link
Contributor

Wait, that's what this PR already does. @Neumann-A I think the "vcpkg.json is the durable/transitive declaration of dependencies" is unaffected here.

Maybe the title of the PR should be changed? Or is vcpkg-configuration.json also considered to be the manifest?
Furthermore can i use the manifest overlays without defining a registry?

@valeriaconde
Copy link
Contributor Author

We consider vcpkg-configuration.json as part of what composes "the manifest" , although this is not clear in the docs for sure.

Furthermore can i use the manifest overlays without defining a registry?

Yes, and just like registries you could also configure overlays in vcpkg.json using the configuration { } tag

@Neumann-A
Copy link
Contributor

Yes, and just like registries you could also configure overlays in vcpkg.json using the configuration { } tag

Is this documented somewhere? I always thought you need to have two different files (vcpkg.json; vcpkg-configuration.json).
https://github.com/microsoft/vcpkg/blob/master/docs/users/manifests.md doesn't mention that.
https://github.com/microsoft/vcpkg/blob/master/docs/users/registries.md also seems to not mention it.
https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json also doesn't have that if I read it correctly.

@vicroms
Copy link
Member

vicroms commented Oct 12, 2022

Yes, and just like registries you could also configure overlays in vcpkg.json using the configuration { } tag

Is this documented somewhere? I always thought you need to have two different files (vcpkg.json; vcpkg-configuration.json). https://github.com/microsoft/vcpkg/blob/master/docs/users/manifests.md doesn't mention that. https://github.com/microsoft/vcpkg/blob/master/docs/users/registries.md also seems to not mention it. https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json also doesn't have that if I read it correctly.

That would be my fault, I don't think it is documented other than the comment I made on the PR #239.

@valeriaconde
Copy link
Contributor Author

valeriaconde commented Oct 12, 2022

That would be my fault, I don't think it is documented other than the comment I made on the PR #239.

I added this to the docs PR I have open (currently on the description of this PR)

src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
azure-pipelines/end-to-end-tests-dir/overlays.ps1 Outdated Show resolved Hide resolved
src/vcpkg-test/configmetadata.cpp Outdated Show resolved Hide resolved
include/vcpkg/vcpkgpaths.h Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Outdated Show resolved Hide resolved
src/vcpkg/vcpkgpaths.cpp Show resolved Hide resolved
@BillyONeal BillyONeal merged commit a1e5a75 into microsoft:main Oct 20, 2022
@BillyONeal
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants