diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-12-06 16:14:22 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-12-27 20:29:46 -0500 |
| commit | 2fa074917597fea0cf3332c6620d3414034825e4 (patch) | |
| tree | 787dc86c8affa560710340a76dcdbbbf7794ff86 /test cases | |
| parent | 26b83eee9427889b5b006079872aa288bc0ffaed (diff) | |
| download | meson-2fa074917597fea0cf3332c6620d3414034825e4.zip meson-2fa074917597fea0cf3332c6620d3414034825e4.tar.gz meson-2fa074917597fea0cf3332c6620d3414034825e4.tar.bz2 | |
add license_files kwarg to project
Hook this up to installed dependency manifests. This is often needed
above and beyond just an SPDX string -- e.g. many licenses have custom
copyright lines.
Diffstat (limited to 'test cases')
6 files changed, 10 insertions, 3 deletions
diff --git a/test cases/common/42 subproject/meson.build b/test cases/common/42 subproject/meson.build index 7f322bc..ae68aa6 100644 --- a/test cases/common/42 subproject/meson.build +++ b/test cases/common/42 subproject/meson.build @@ -1,6 +1,8 @@ project('subproj user', 'c', version : '2.3.4', - license : 'mylicense') + license : 'mylicense', + license_files: 'mylicense.txt', +) assert(meson.project_name() == 'subproj user', 'Incorrect project name') diff --git a/test cases/common/42 subproject/mylicense.txt b/test cases/common/42 subproject/mylicense.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/42 subproject/mylicense.txt diff --git a/test cases/common/42 subproject/subprojects/sublib/meson.build b/test cases/common/42 subproject/subprojects/sublib/meson.build index 3a620fe..0c40241 100644 --- a/test cases/common/42 subproject/subprojects/sublib/meson.build +++ b/test cases/common/42 subproject/subprojects/sublib/meson.build @@ -1,6 +1,8 @@ project('subproject', 'c', version : '1.0.0', - license : ['sublicense1', 'sublicense2']) + license : ['sublicense1', 'sublicense2'], + license_files: ['sublicense1.txt', 'sublicense2.txt'], +) if not meson.is_subproject() error('Claimed to be master project even though we are a subproject.') diff --git a/test cases/common/42 subproject/subprojects/sublib/sublicense1.txt b/test cases/common/42 subproject/subprojects/sublib/sublicense1.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/42 subproject/subprojects/sublib/sublicense1.txt diff --git a/test cases/common/42 subproject/subprojects/sublib/sublicense2.txt b/test cases/common/42 subproject/subprojects/sublib/sublicense2.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/42 subproject/subprojects/sublib/sublicense2.txt diff --git a/test cases/common/42 subproject/test.json b/test cases/common/42 subproject/test.json index a56106f..949cb79 100644 --- a/test cases/common/42 subproject/test.json +++ b/test cases/common/42 subproject/test.json @@ -2,6 +2,9 @@ "installed": [ {"type": "exe", "file": "usr/bin/user"}, {"type": "pdb", "file": "usr/bin/user"}, - {"type": "file", "file": "usr/share/sublib/sublib.depmf"} + {"type": "file", "file": "usr/share/sublib/sublib.depmf"}, + {"type": "file", "file": "usr/share/sublib/mylicense.txt"}, + {"type": "file", "file": "usr/share/sublib/subprojects/sublib/sublicense1.txt"}, + {"type": "file", "file": "usr/share/sublib/subprojects/sublib/sublicense2.txt"} ] } |