maint(core): fix option defaults for Meson >= 1.1#15127
maint(core): fix option defaults for Meson >= 1.1#15127ermshiperete wants to merge 1 commit intomasterfrom
Conversation
Meson 1.1 changed the name of the options file from `meson_options.txt` to `meson.options`. This change creates symlinks for these files until we can update the required min version. One thing where the lack of the options was noticeable was that we didn't run the core WASM tests. Test-bot: skip
github-actions
bot
added
developer/
linux/
linux/engine/
core/
User Test ResultsTest specification and instructions User tests are not required Test Artifacts
|
|
There are two reasons to not update the minimum required Meson version at this point:
This change doesn't seem important enough to warrant a change of the min Meson version at this point. |
Symlinks are not enabled in Git for Windows by default (see https://gitforwindows.org/symbolic-links.html). Instead, we need to just copy the files, and add a note at the top of them to keep them in sync, and to remove the .txt version once we have a min ver of meson 1.1. (Annoying silly filename changes causing unnecessary maintenance!) |
There was a problem hiding this comment.
This symlink is also in the wrong place (and as noted needs to be a regular file copy of meson_options.txt). It should be in developer/src/kmcmplib.
Yes, I noticed that on TC. Unfortunately copying the file doesn't work since then meson complains:
I'll close this PR and implement a different approach. |
Argh, seriously meson?! What a pain! |
Meson 1.1 changed the name of the options file from `meson_options.txt` to `meson.options`. Currently we're stuck with Meson 1.0 as minimum Meson version because we still support Ubuntu 22.04 Jammy, but on some machines a newer version of meson gets installed which causes the options to be ignored. The first attempt to simply symlink or copy `meson_options.txt` to `meson.options` failed because git on Windows doesn't support symlinks by default, and Meson complains if it finds two options files (#15127). Fortunately not having an options file is only a problem for Core where we have one option in the options file that defaults to true. The solution implemented in this change is to always pass the option to Meson. Test-bot: skip
|
Replaced by #15131 |
maint(core): fix option defaults for Meson >= 1.1 Meson 1.1 changed the name of the options file from `meson_options.txt` to `meson.options`. Currently we're stuck with Meson 1.0 as minimum Meson version because we still support Ubuntu 22.04 Jammy, but on some machines a newer version of meson gets installed which causes the options to be ignored. The first attempt to simply symlink or copy `meson_options.txt` to `meson.options` failed because git on Windows doesn't support symlinks by default, and Meson complains if it finds two options files (#15127). Fortunately not having an options file is only a problem for Core where we have one option in the options file that defaults to true. The solution implemented in this change is to always pass the option to Meson.
Meson 1.1 changed the name of the options file from `meson_options.txt` to `meson.options`. Currently we're stuck with Meson 1.0 as minimum Meson version because we still support Ubuntu 22.04 Jammy, but on some machines a newer version of meson gets installed which causes the options to be ignored. The first attempt to simply symlink or copy `meson_options.txt` to `meson.options` failed because git on Windows doesn't support symlinks by default, and Meson complains if it finds two options files (#15127). Fortunately not having an options file is only a problem for Core where we have one option in the options file that defaults to true. The solution implemented in this change is to always pass the option to Meson. Cherry-pick-of: #15131 Test-bot: skip
…options Meson 1.1 changed the name of the options file from `meson_options.txt` to `meson.options`. Currently we're stuck with Meson 1.0 as minimum Meson version because we still support Ubuntu 22.04 Jammy, but on some machines a newer version of meson gets installed which causes the options to be ignored. The first attempt to simply symlink or copy `meson_options.txt` to `meson.options` failed because git on Windows doesn't support symlinks by default, and Meson complains if it finds two options files (#15127). Fortunately not having an options file is only a problem for Core where we have one option in the options file that defaults to true. The solution implemented in this change is to always pass the option to Meson. Cherry-pick-of: #15131
2 participants
Meson 1.1 changed the name of the options file from
meson_options.txttomeson.options. This change creates symlinks for these files until we can update the required min version.One thing where the lack of the options was noticeable was that we didn't run the core WASM tests.
Test-bot: skip