diff options
| author | Xavier Claessens <xclaessens@netflix.com> | 2025-06-06 08:03:15 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-08-01 07:55:49 -0700 |
| commit | 56e84d35deef8aea2b0beda2ec14ca22334a7f0f (patch) | |
| tree | 210aac22e3b450363c4cfd4538b6754f3a6fa6f7 /test cases/common | |
| parent | 095c852ef3cb93c5fb01ca44b1632d9dd2dae207 (diff) | |
| download | meson-56e84d35deef8aea2b0beda2ec14ca22334a7f0f.tar.gz | |
wrap: wraps from subprojects can replace directories found with no wrap
If main project finds a directory subprojects/foo with no corresponding
foo.wrap, it creates a dummy PackageDefinition for it. If we later find
a subproject that has foo.wrap, replace the dummy wrap with it.
This happens for example when wrap-redirect have been deleted. It also
happens for subprojects downloaded from some Cargo.lock which does not
create a wrap-redirect.
Avoid loading the same location twice, which can happen when preparing
cargo subprojects.
Diffstat (limited to 'test cases/common')
4 files changed, 25 insertions, 0 deletions
diff --git a/test cases/common/282 wrap override/meson.build b/test cases/common/282 wrap override/meson.build new file mode 100644 index 000000000..76c84d6a1 --- /dev/null +++ b/test cases/common/282 wrap override/meson.build @@ -0,0 +1,8 @@ +project('wrap override') + + +subproject('sub') + +# sub has subsub.wrap that provides subsub-1.0 dependency. Even if sub itself +# does not use it, that dependency should now be available. +dependency('subsub-1.0') diff --git a/test cases/common/282 wrap override/subprojects/sub/meson.build b/test cases/common/282 wrap override/subprojects/sub/meson.build new file mode 100644 index 000000000..abefb30fc --- /dev/null +++ b/test cases/common/282 wrap override/subprojects/sub/meson.build @@ -0,0 +1,7 @@ +project('sub') + +# Simulate an optional feature that requires subsub.wrap, but that feature is +# not enabled. +if false + dependency('subsub-1.0') +endif diff --git a/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap b/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap new file mode 100644 index 000000000..85a1a7c51 --- /dev/null +++ b/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap @@ -0,0 +1,5 @@ +[wrap-file] + + +[provide] +dependency_names = subsub-1.0 diff --git a/test cases/common/282 wrap override/subprojects/subsub/meson.build b/test cases/common/282 wrap override/subprojects/subsub/meson.build new file mode 100644 index 000000000..668dcb3b0 --- /dev/null +++ b/test cases/common/282 wrap override/subprojects/subsub/meson.build @@ -0,0 +1,5 @@ +project('sub') + +# This simulates a subproject we previously downloaded using +# subproject/sub/subproject/subsub.wrap +meson.override_dependency('subsub-1.0', declare_dependency()) |