Add option to generate tz-coords.h as part of the build process. #405
Conversation
This file contains 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
SparkyBluefang
commented
Dec 23, 2024
Comment on lines
-13
to
+24
| res = re.search(r"([A-Z]{2})\s([0-9-+]+)\s([\w/_\-]+)\s", line) | ||
| code, coords, tz = res.groups() | ||
|
|
||
| res = re.search(r"([+-]{1})([0-9]+)([+-]{1})([0-9]+)", coords) | ||
| lat_sign, lat_val, long_sign, long_val = res.groups() | ||
| coords, tz = line.split('\t')[1:3] | ||
| lat_sign, lat_val, long_sign, long_val = COORDS_RE.search(coords).groups() |
There was a problem hiding this comment.
The file is tab delimited, so simplify the parsing a bit. Also pre-compile the remaining regex.
SparkyBluefang
commented
Dec 23, 2024
Comment on lines
-32
to
+39
| const char *timezone; | ||
| const gchar *timezone; |
There was a problem hiding this comment.
Updated to match the committed file.
SparkyBluefang
commented
Dec 23, 2024
Comment on lines
+3
to
+14
| if get_option('generate_tz_coords') | ||
| prog_python = find_program('python3') | ||
|
|
||
| tz_coords_h = custom_target( | ||
| 'tz_coords_h', | ||
| input: get_option('zone_tab'), | ||
| output: 'tz-coords.h', | ||
| command: [prog_python, '@CURRENT_SOURCE_DIR@/generate-tz-header.py', '-i', '@INPUT@', '-o', '@OUTPUT@'] | ||
| ) | ||
| else | ||
| tz_coords_h = files('tz-coords.h') | ||
| endif |
There was a problem hiding this comment.
I added the generate_tz_coords option to maintain existing behavior. However, I don't think it would be unreasonable to make this unconditional and delete the pre-generated file.
SparkyBluefang
commented
Dec 23, 2024
Comment on lines
-35
to
+47
| sources + built_sources, | ||
| sources + built_sources + [tz_coords_h], |
There was a problem hiding this comment.
The brackets seem to be needed for meson <= 0.60.0
WARNING: Project targets '>=0.56.0' but uses feature introduced in '0.60.0': list.<plus>. The right hand operand was not a list.
clefebvre
changed the title
clefebvre
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Allow distros to optionally re-generate the
tz-coords.hheader, on build, with their packaged version of timezone-data/tzdata.I would have updated the csd-night-light code to dynamically parse the zone db, but I haven't done anything significant in C for quite some time.
This is a happy medium, which will make it easier for Gentoo to trigger a rebuild of cinnamon-settings-daemon whenever the zone db gets updated.