Add MVP implementation of overriding options. #1457
Conversation
jpakkane
force-pushed
the
overrides
branch
5 times, most recently
from
602f4d6
to
b414e51
Compare
run_unittests.py
Outdated
| @@ -1189,6 +1189,25 @@ def test_installed_modes(self): | |||
| self.assertEqual(0, statf.st_uid) | |||
|
|
|||
|
|
|||
| def test_cpp_std_override(self): | |||
There was a problem hiding this comment.
[flake8]
- [E303] too many blank lines (2)
mesonbuild/backend/vs2010backend.py
Outdated
| @@ -6,7 +6,7 @@ | |||
|
|
|||
| # http://www.apache.org/licenses/LICENSE-2.0 | |||
|
|
|||
| # Unless required by applicable law or agreed to in writing, software | |||
| # Unless required by applicable law or agreed to in writingget_, software | |||
|
I like this PR overall, what's blocking it from merging? |
|
Lack of review. |
|
Okay, I'll do a proper review of this tomorrow. |
mesonbuild/backend/ninjabackend.py
Outdated
| @@ -1882,6 +1884,13 @@ def generate_single_compile(self, target, outfile, src, is_generated=False, head | |||
| raise AssertionError('BUG: sources should not contain headers {!r}'.format(src)) | |||
| if isinstance(src, RawFilename) and src.fname.endswith('.h'): | |||
| raise AssertionError('BUG: sources should not contain headers {!r}'.format(src.fname)) | |||
| extra_orderdeps = [] | |||
There was a problem hiding this comment.
[flake8]
- [F841] local variable 'extra_orderdeps' is assigned to but never used
The rest of it looks good to me. The nice part about this rework is that at most some options won't be properly overriden per-target, which shouldn't cause regressions and can be fixed when reported.
mesonbuild/coredata.py
Outdated
| if isinstance(value, str): | ||
| if not value.startswith('['): | ||
| raise MesonException('Valuestring does not define an array: ' + value) | ||
| newvalue = eval(value, {}, {}) # Yes, it is unsafe. |
There was a problem hiding this comment.
import ast
newvalue = ast.literal_eval(value)
mesonbuild/backend/backends.py
Outdated
|
|
||
| class OptionOverrideProxy: | ||
| '''Mimic an option list but transparently override | ||
| selected option values.''' |
There was a problem hiding this comment.
This should start with an indent. Python docs remove leading indentation automatically.
| @@ -1899,6 +1908,10 @@ def generate_single_compile(self, target, outfile, src, is_generated=False, head | |||
| abs_src = src.fname | |||
| else: | |||
| abs_src = os.path.join(self.environment.get_build_dir(), src.fname) | |||
| elif isinstance(src, mesonlib.File): | |||
There was a problem hiding this comment.
Is this needed? We have an else: if isinstance(src, File): below again.
There was a problem hiding this comment.
It breaks if this is not there. Let's fix it when ripping out RawFile. Weirdly, I thought I already did it ages ago but apparently not.
|
|
||
| executable('mustunity', 'one.c', 'two.c') | ||
| executable('notunity', 'three.c', 'four.c', | ||
| override_options : ['unity=false']) |
There was a problem hiding this comment.
Should test the other option types too, not just string. And maybe also test overriding options set from various sources: project(), built-in, command-line, meson_options, etc.
There was a problem hiding this comment.
Added werror test. You can't really override meson_options because these overrides are only used inside builtin targets and those do not look up project options.
|
I can't meaningfully review this, but I am looking forward to seeing this land and using it. |
|
Updated apart from tests. |
|
Rebased, should be good now. |
Allow (eventually) overriding any options. Uses include:
This is a rough idea, refinement comments welcome.