diff options
| author | Benjamin Gilbert <bgilbert@backtick.net> | 2025-06-23 15:14:46 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-18 08:32:28 -0800 |
| commit | 2e1ed001b2cada254e2b3fea72bce310361b2aa6 (patch) | |
| tree | 10ccef25af18d8173cd3c424f16d13599131130d | |
| parent | 07884e366ba2ac376c8a6f7ea31804cafba910cd (diff) | |
| download | meson-2e1ed001b2cada254e2b3fea72bce310361b2aa6.tar.gz | |
rewriter: support project(license_files: )
| -rw-r--r-- | mesonbuild/rewriter.py | 1 | ||||
| -rw-r--r-- | test cases/rewrite/3 kwargs/add.json | 3 | ||||
| -rw-r--r-- | test cases/rewrite/3 kwargs/set.json | 3 | ||||
| -rw-r--r-- | unittests/rewritetests.py | 6 |
4 files changed, 8 insertions, 5 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index de5a34fe8..39d3fcdc8 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -362,6 +362,7 @@ rewriter_func_kwargs = { 'default_options': MTypeStrList, 'meson_version': MTypeStr, 'license': MTypeStrList, + 'license_files': MTypeStrList, 'subproject_dir': MTypeStr, 'version': MTypeStr } diff --git a/test cases/rewrite/3 kwargs/add.json b/test cases/rewrite/3 kwargs/add.json index 5b3ce0b4d..94354d108 100644 --- a/test cases/rewrite/3 kwargs/add.json +++ b/test cases/rewrite/3 kwargs/add.json @@ -5,7 +5,8 @@ "id": "/", "operation": "set", "kwargs": { - "license": "GPL" + "license": "GPL", + "license_files": "GPL.txt" } }, { diff --git a/test cases/rewrite/3 kwargs/set.json b/test cases/rewrite/3 kwargs/set.json index 6ca2ee4ae..923ce4002 100644 --- a/test cases/rewrite/3 kwargs/set.json +++ b/test cases/rewrite/3 kwargs/set.json @@ -7,7 +7,8 @@ "kwargs": { "version": "0.0.2", "meson_version": "0.50.0", - "license": ["GPL", "MIT"] + "license": ["GPL", "MIT"], + "license_files": ["GPL.txt", "MIT.txt"] } }, { diff --git a/unittests/rewritetests.py b/unittests/rewritetests.py index a479f3d0d..7cfe6c0fb 100644 --- a/unittests/rewritetests.py +++ b/unittests/rewritetests.py @@ -295,7 +295,7 @@ class RewriterTests(BasePlatformTests): out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json')) expected = { 'kwargs': { - 'project#/': {'version': '0.0.2', 'meson_version': '0.50.0', 'license': ['GPL', 'MIT']}, + 'project#/': {'version': '0.0.2', 'meson_version': '0.50.0', 'license': ['GPL', 'MIT'], 'license_files': ['GPL.txt', 'MIT.txt']}, 'target#tgt1': {'build_by_default': False, 'build_rpath': '/usr/local', 'dependencies': 'dep1'}, 'dependency#dep1': {'required': True, 'method': 'cmake'} } @@ -308,7 +308,7 @@ class RewriterTests(BasePlatformTests): out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json')) expected = { 'kwargs': { - 'project#/': {'version': '0.0.1', 'license': ['GPL', 'MIT', 'BSD', 'Boost']}, + 'project#/': {'version': '0.0.1', 'license': ['GPL', 'MIT', 'BSD', 'Boost'], 'license_files': 'GPL.txt'}, 'target#tgt1': {'build_by_default': True}, 'dependency#dep1': {'required': False} } @@ -498,5 +498,5 @@ class RewriterTests(BasePlatformTests): for source in sorted(interpreter.dataflow_dag.tgt_to_srcs[target], key=sortkey): dag_as_str += f" {node_to_str(source)}\n" - expected = Path(test_path / "expected_dag.txt").read_text().strip() + expected = Path(test_path / "expected_dag.txt").read_text(encoding='utf-8').strip() self.assertEqual(dag_as_str.strip(), expected) |