summaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2024-08-29 18:46:44 -0400
committerEli Schwartz <eschwartz93@gmail.com>2024-08-30 15:44:13 -0400
commit19847ba24a5a6e7c33c4e00a49842d77f7c5a4a3 (patch)
tree0aed0c65525044ecb5cb6cd6a08aa568bd3d7262 /mesonbuild/interpreter
parent29797f92f818744adcdb354ca798036168608ac7 (diff)
downloadmeson-19847ba24a5a6e7c33c4e00a49842d77f7c5a4a3.tar.gz
update various deprecation notices to call out meson 2.0
Diffstat (limited to 'mesonbuild/interpreter')
-rw-r--r--mesonbuild/interpreter/interpreter.py6
-rw-r--r--mesonbuild/interpreter/interpreterobjects.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index 7bcbf8c6d..9de0f8762 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -256,7 +256,7 @@ permitted_dependency_kwargs = {
implicit_check_false_warning = """You should add the boolean check kwarg to the run_command call.
It currently defaults to false,
- but it will default to true in future releases of meson.
+ but it will default to true in meson 2.0.
See also: https://github.com/mesonbuild/meson/issues/9300"""
class Interpreter(InterpreterBase, HoldableObject):
@@ -2300,7 +2300,7 @@ class Interpreter(InterpreterBase, HoldableObject):
if kwargs['install_dir'] is not None:
raise InterpreterException('install_headers: cannot specify both "install_dir" and "subdir". Use only "install_dir".')
if os.path.isabs(install_subdir):
- mlog.deprecation('Subdir keyword must not be an absolute path. This will be a hard error in the next release.')
+ mlog.deprecation('Subdir keyword must not be an absolute path. This will be a hard error in meson 2.0.')
else:
install_subdir = ''
@@ -3157,7 +3157,7 @@ class Interpreter(InterpreterBase, HoldableObject):
if not strict and s.startswith(self.environment.get_build_dir()):
results.append(s)
mlog.warning(f'Source item {s!r} cannot be converted to File object, because it is a generated file. '
- 'This will become a hard error in the future.', location=self.current_node)
+ 'This will become a hard error in meson 2.0.', location=self.current_node)
else:
self.validate_within_subproject(self.subdir, s)
results.append(mesonlib.File.from_source_file(self.environment.source_dir, self.subdir, s))
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
index bbc5b8608..155cfd23e 100644
--- a/mesonbuild/interpreter/interpreterobjects.py
+++ b/mesonbuild/interpreter/interpreterobjects.py
@@ -938,7 +938,7 @@ class BuildTargetHolder(ObjectHolder[_BuildTarget]):
extract_all_objects called without setting recursive
keyword argument. Meson currently defaults to
non-recursive to maintain backward compatibility but
- the default will be changed in the future.
+ the default will be changed in meson 2.0.
''')
)
)