diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2025-03-20 12:16:06 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-03-20 13:44:41 -0400 |
| commit | e5286aefd962df25dee58556c4ce6dafa4bfd1c3 (patch) | |
| tree | ec418b03e473dba3126b55cab72389c594017e48 /test cases/common | |
| parent | d8f68703b792ff6e9cfc2674fdf9bbd53ac170ca (diff) | |
| download | meson-e5286aefd962df25dee58556c4ce6dafa4bfd1c3.tar.gz | |
handle monorepo license files specified in project() via ../
We should simply remap these to elide the ../ as it's pretty obviously
the natural expectation of using ../ to fetch files from outside the
project and then drop them *into* the project.
Monorepos will likely have a single license file (or set) under which
the monorepo is licensed. But there will be many components, each of
which may use a different build system, which are "standalone" for the
most part. We already support this case as long as you build from the
monorepo, but the resulting license file gets installed to
```
{licensedir}/../
```
which is silly and unhelpful.
Bug: https://github.com/apache/arrow/issues/36411
Diffstat (limited to 'test cases/common')
| -rw-r--r-- | test cases/common/42 subproject/meson.build | 3 | ||||
| -rw-r--r-- | test cases/common/42 subproject/test.json | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test cases/common/42 subproject/meson.build b/test cases/common/42 subproject/meson.build index c2c0122f1..bc24adbcc 100644 --- a/test cases/common/42 subproject/meson.build +++ b/test cases/common/42 subproject/meson.build @@ -1,7 +1,8 @@ project('subproj user', 'c', version : '2.3.4', license : 'mylicense', - license_files: 'mylicense.txt', + # also grab the meson license to test monorepo support + license_files: ['mylicense.txt', '../../../COPYING'], ) assert(meson.project_name() == 'subproj user', 'Incorrect project name') diff --git a/test cases/common/42 subproject/test.json b/test cases/common/42 subproject/test.json index 949cb79fa..e469052f4 100644 --- a/test cases/common/42 subproject/test.json +++ b/test cases/common/42 subproject/test.json @@ -4,6 +4,7 @@ {"type": "pdb", "file": "usr/bin/user"}, {"type": "file", "file": "usr/share/sublib/sublib.depmf"}, {"type": "file", "file": "usr/share/sublib/mylicense.txt"}, + {"type": "file", "file": "usr/share/sublib/COPYING"}, {"type": "file", "file": "usr/share/sublib/subprojects/sublib/sublicense1.txt"}, {"type": "file", "file": "usr/share/sublib/subprojects/sublib/sublicense2.txt"} ] |