aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/markdown/Rewriter.md4
-rw-r--r--mesonbuild/rewriter.py2
-rwxr-xr-xrun_unittests.py16
-rw-r--r--test cases/rewrite/3 kwargs/add.json6
-rw-r--r--test cases/rewrite/3 kwargs/defopts_delete.json2
-rw-r--r--test cases/rewrite/3 kwargs/info.json2
-rw-r--r--test cases/rewrite/3 kwargs/remove.json6
-rw-r--r--test cases/rewrite/3 kwargs/remove_regex.json4
-rw-r--r--test cases/rewrite/3 kwargs/set.json2
9 files changed, 22 insertions, 22 deletions
diff --git a/docs/markdown/Rewriter.md b/docs/markdown/Rewriter.md
index 73611e9..b6301d6 100644
--- a/docs/markdown/Rewriter.md
+++ b/docs/markdown/Rewriter.md
@@ -86,14 +86,14 @@ meson rewriter kwargs {set/delete} <function type> <function ID> <key1> <value1>
For instance, setting the project version can be achieved with this command:
```bash
-meson rewriter kwargs set project '' version 1.0.0
+meson rewriter kwargs set project / version 1.0.0
```
Currently, only the following function types are supported:
- dependency
- target (any build target, the function ID is the target name/ID)
-- project (the function ID must be an empty string since project() can only be called once)
+- project (the function ID must be `/` since project() can only be called once)
For more information see the help output of the rewriter kwargs command.
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py
index 2e50f20..6a97dd0 100644
--- a/mesonbuild/rewriter.py
+++ b/mesonbuild/rewriter.py
@@ -500,7 +500,7 @@ class Rewriter:
node = None
arg_node = None
if cmd['function'] == 'project':
- if cmd['id'] != '':
+ if cmd['id'] != '/':
mlog.error('The ID for the function type project must be an empty string', *self.on_error())
self.handle_error()
node = self.interpreter.project_node
diff --git a/run_unittests.py b/run_unittests.py
index 2471e44..dba957a 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5415,7 +5415,7 @@ class RewriterTests(BasePlatformTests):
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
expected = {
'kwargs': {
- 'project#': {'version': '0.0.1'},
+ 'project#/': {'version': '0.0.1'},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
@@ -5428,7 +5428,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']},
'target#tgt1': {'build_by_default': False, 'build_rpath': '/usr/local', 'dependencies': 'dep1'},
'dependency#dep1': {'required': True, 'method': 'cmake'}
}
@@ -5441,7 +5441,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']},
+ 'project#/': {'version': '0.0.1', 'license': ['GPL', 'MIT', 'BSD']},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
@@ -5454,7 +5454,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'},
+ 'project#/': {'version': '0.0.1', 'license': 'GPL'},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
@@ -5467,7 +5467,7 @@ class RewriterTests(BasePlatformTests):
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
expected = {
'kwargs': {
- 'project#': {'version': '0.0.1', 'default_options': ['buildtype=release', 'debug=true']},
+ 'project#/': {'version': '0.0.1', 'default_options': ['buildtype=release', 'debug=true']},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
@@ -5480,7 +5480,7 @@ class RewriterTests(BasePlatformTests):
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
expected = {
'kwargs': {
- 'project#': {},
+ 'project#/': {},
'target#tgt1': {},
'dependency#dep1': {'required': False}
}
@@ -5493,7 +5493,7 @@ class RewriterTests(BasePlatformTests):
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
expected = {
'kwargs': {
- 'project#': {'version': '0.0.1', 'default_options': ['buildtype=release', 'debug=True', 'cpp_std=c++11']},
+ 'project#/': {'version': '0.0.1', 'default_options': ['buildtype=release', 'debug=True', 'cpp_std=c++11']},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
@@ -5506,7 +5506,7 @@ class RewriterTests(BasePlatformTests):
out = self.rewrite(self.builddir, os.path.join(self.builddir, 'info.json'))
expected = {
'kwargs': {
- 'project#': {'version': '0.0.1', 'default_options': ['cpp_std=c++14', 'debug=true']},
+ 'project#/': {'version': '0.0.1', 'default_options': ['cpp_std=c++14', 'debug=true']},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
diff --git a/test cases/rewrite/3 kwargs/add.json b/test cases/rewrite/3 kwargs/add.json
index e398b7b..2148a1e 100644
--- a/test cases/rewrite/3 kwargs/add.json
+++ b/test cases/rewrite/3 kwargs/add.json
@@ -2,7 +2,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "set",
"kwargs": {
"license": "GPL"
@@ -11,7 +11,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "add",
"kwargs": {
"license": ["MIT"]
@@ -20,7 +20,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "add",
"kwargs": {
"license": "BSD"
diff --git a/test cases/rewrite/3 kwargs/defopts_delete.json b/test cases/rewrite/3 kwargs/defopts_delete.json
index 06232dd..4fe39e2 100644
--- a/test cases/rewrite/3 kwargs/defopts_delete.json
+++ b/test cases/rewrite/3 kwargs/defopts_delete.json
@@ -2,7 +2,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "set",
"kwargs": {
"default_options": ["cpp_std=c++14", "buildtype=release", "debug=true"]
diff --git a/test cases/rewrite/3 kwargs/info.json b/test cases/rewrite/3 kwargs/info.json
index 5fd1a64..0eed404 100644
--- a/test cases/rewrite/3 kwargs/info.json
+++ b/test cases/rewrite/3 kwargs/info.json
@@ -2,7 +2,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "info"
},
{
diff --git a/test cases/rewrite/3 kwargs/remove.json b/test cases/rewrite/3 kwargs/remove.json
index bd7596f..5dc7836 100644
--- a/test cases/rewrite/3 kwargs/remove.json
+++ b/test cases/rewrite/3 kwargs/remove.json
@@ -2,7 +2,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "set",
"kwargs": {
"license": ["GPL", "MIT", "BSD"]
@@ -11,7 +11,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "remove",
"kwargs": {
"license": ["MIT"]
@@ -20,7 +20,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "remove",
"kwargs": {
"license": "BSD"
diff --git a/test cases/rewrite/3 kwargs/remove_regex.json b/test cases/rewrite/3 kwargs/remove_regex.json
index fcb04eb..1043101 100644
--- a/test cases/rewrite/3 kwargs/remove_regex.json
+++ b/test cases/rewrite/3 kwargs/remove_regex.json
@@ -2,7 +2,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "set",
"kwargs": {
"default_options": ["cpp_std=c++14", "buildtype=release", "debug=true"]
@@ -11,7 +11,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "remove_regex",
"kwargs": {
"default_options": ["cpp_std=.*"]
diff --git a/test cases/rewrite/3 kwargs/set.json b/test cases/rewrite/3 kwargs/set.json
index 7d60c4f..a56c599 100644
--- a/test cases/rewrite/3 kwargs/set.json
+++ b/test cases/rewrite/3 kwargs/set.json
@@ -2,7 +2,7 @@
{
"type": "kwargs",
"function": "project",
- "id": "",
+ "id": "/",
"operation": "set",
"kwargs": {
"version": "0.0.2",
generated by cgit v1.1 at 2025-04-02 07:19:20 +0000