Update constants for systemd 258 #157
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ ninja -C build update-constants -v ninja: Entering directory `build' [1/1] /home/zbyszek/src/python-systemd/update-constants.py /home/zbyszek/src/python-systemd/src/systemd/id128-constants.h /home/zbyszek/src/python-systemd/docs/id128.rst /home/zbyszek/src/python-systemd/src/systemd/id128-defines.h /usr/include/systemd/sd-messages.h Writing /home/zbyszek/src/python-systemd/src/systemd/id128-constants.h… Writing /home/zbyszek/src/python-systemd/src/systemd/id128-defines.h… Writing /home/zbyszek/src/python-systemd/docs/id128.rst… The helper is updated to do the everything in the python script. The wrapper in Makefile is dropped. It wasn't working properly anyway, and I think the version in meson is enough.
The previous commit changes the sorting algorithm, so a few lines moved up or down a bit.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
behrmann
reviewed
Oct 4, 2025
Comment on lines
+18
to
+19
| defs = sum((list(defines(file)) for file in inputs), start=[]) | ||
| defs = sorted(set(defs)) |
There was a problem hiding this comment.
That's a bit obtuse, let's add a comment here.
Suggested change
| defs = sum((list(defines(file)) for file in inputs), start=[]) | |
| defs = sorted(set(defs)) | |
| # Collect all messages into a single sorted, deduplicated list | |
| defs = sum((list(defines(file)) for file in inputs), start=[]) | |
| defs = sorted(set(defs)) |
| assert 'SD_ID128_MAKE' in value | ||
| yield name, value | ||
|
|
||
| def process(output, docfile, inputs): |
There was a problem hiding this comment.
Nit: two empty lines
Suggested change
| def process(output, docfile, inputs): | |
| def process(output, docfile, inputs): |
| assert 'SD_ID128_MAKE' in value | ||
| yield name, value | ||
|
|
||
| def process(output, docfile, inputs): |
There was a problem hiding this comment.
inputs[0] is special, since it will be rewritten, let's treat it separately
Suggested change
| def process(output, docfile, inputs): | |
| def process(output, docfile, msgheader, extra_inputs): |
|
|
||
| with open(inputs[0], 'wt') as out: | ||
| print(f'Writing {out.name}…') | ||
| for (name, value) in defs: |
There was a problem hiding this comment.
Nit:
Suggested change
| for (name, value) in defs: | |
| for name, value in defs: |
| print(line, file=out) | ||
| if 'autogenerated' in line: | ||
| break | ||
| for (name, value) in defs: |
There was a problem hiding this comment.
same
Suggested change
| for (name, value) in defs: | |
| for name, value in defs: |
behrmann
reviewed
Oct 4, 2025
|
|
||
| include_dir = libsystemd_dep.get_variable(pkgconfig: 'includedir') | ||
|
|
||
| update_constants = custom_target( |
There was a problem hiding this comment.
Having bashed my head against meson for a bit now, shouldn't this be a run_target instead?
There was a problem hiding this comment.
Dunno. I copied from the systemd config, update-man-rules target.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.