Refactor getting option values #13086
Conversation
jpakkane
force-pushed
the
optionrefactor
branch
10 times, most recently
from
a6eb4b7
to
9a5f92b
Compare
jpakkane
force-pushed
the
optionrefactor
branch
from
f818bbd
to
82e1b6b
Compare
mesonbuild/build.py
Outdated
| @@ -669,6 +669,9 @@ def get_option(self, key: 'OptionKey') -> T.Union[str, int, bool, 'WrapMode']: | |||
| # in the future we might be able to remove the cast here | |||
| return T.cast('T.Union[str, int, bool, WrapMode]', self.options[key].value) | |||
|
|
|||
| def get_raw_override(self, key: str) -> T.Optional(str): | |||
There was a problem hiding this comment.
There's no point in reviewing typing at this point, the methods are probably going to change before this is ready.
There was a problem hiding this comment.
Yeah, I mostly did a cursory scan to see if there was any design stuff I was concerned about, which there isn't :)
There was a problem hiding this comment.
There is one design question still unanswered, though. Should options defined in subproject and project become these additional options? I think they should, because then you can alter them after the fact from the command line without editing source files.
There was a problem hiding this comment.
Can you give me an example of what you mean?
There was a problem hiding this comment.
Well suppose you have a subproject that starts with this:
project('something', default_options: ['cpp_std=c++17'])Should the output of configure be something like:
<default options here>
Per-project options overrides [or whatever]:
something:cpp_std=c++17
And should you be able to unset that so it reverts to the global default with:
meson configure -U something:cpp_std
There was a problem hiding this comment.
In my opinion, yes that is what should happen. This implies two different things:
- Any "basic" option should be overriddable
- All such deviations from the default (whether from subproject override, project setting or
meson configure -A) should be stored in the same way
Note that "override" is a bad term because we already have override_options but I did not come up with a better one.
There was a problem hiding this comment.
On thing that I've always wanted is the ability to override the superproject but not the subproject, so assuming mesa:
meson setup builddir -Ddebug=false -Dmesa:debug=trueso that I can easily set a default, but override the main project just like subprojects. Any chance that would work after your changes?
There was a problem hiding this comment.
That functionality is planned, yes. The actual syntax is not yet final, though. The one I'm currently leaning towards is this:
meson configure -A :cpp_std=c++20
would set the option on the top level project. Thus if you want to build your project so that it is in debug mode, but optimisations are enabled on subprojects only you'd do something like:
meson setup --buildtype=debug <other args>
meson configure -Doptimization=2
meson configure -A :optimization=0
These could be all in one command, I just split it into three for easier readability.
jpakkane
force-pushed
the
optionrefactor
branch
from
82e1b6b
to
142c3f5
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -495,15 +501,16 @@ | |||
| full_version=full_version) | |||
| ClangClCompiler.__init__(self, target) | |||
|
|
|||
| def get_option_compile_args(self, options: 'KeyedOptionDictType') -> T.List[str]: | |||
| def get_option_compile_args(self, target: 'BuildTarget', env: 'Environment', subproject=None) -> T.List[str]: | |||
| args = [] | |||
Check notice
Code scanning / CodeQL
Unused local variable Note
jpakkane
force-pushed
the
optionrefactor
branch
from
e418265
to
a3fcf6b
Compare
|
This is ugly as sin, but it now finally works on Linux at least (more specifically There is no actual override ability yet, but it should be fairly straightforward to add on top of this. This requires a bunch of cleanup before it can be considered for merging. But at least the groundwork is there. |
| def create_sp_options(self, A) -> bool: | ||
| if A is None: | ||
| return False | ||
| import copy |
Check notice
Code scanning / CodeQL
Module is imported more than once Note
|
Now it works enough to run the brand new unit test. Do read it to get a grasp on how this is supposed to be used. Design comments welcome, actual code is missing a ton of cleanup still so maybe hold off on that unless you see something egregious. |
bruchar1
added
refactoring
|
The unit test that checks per project overrides now passes, but a ton of other unit tests have started failing. Next I need to fix those. It seems that this requires writing a new class |
| # SPDX-License-Identifier: Apache-2.0 | ||
| # Copyright 2024 Meson project contributors | ||
|
|
||
| from mesonbuild.options import * |
Check notice
Code scanning / CodeQL
'import *' may pollute namespace Note
Currently option values for a target are store in the target object as a "view". This works for the current setup but is very inconvenient for #9398. This MR refactors things both to make things simpler and to make overriding values from the command line possible.
buildobjects shall only contain "raw data" and computing "option values" for themget_optionshall use a similar sort of centralised method (not yet added)This is WIP and will probably fail tests on other platforms. Do not merge yet, I need to add and squash things as outlined in the first commit message before this is ready.