diff options
| -rw-r--r-- | data/syntax-highlighting/vim/syntax/meson.vim | 20 | ||||
| -rw-r--r-- | mesonbuild/ast/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 11 |
3 files changed, 9 insertions, 24 deletions
diff --git a/data/syntax-highlighting/vim/syntax/meson.vim b/data/syntax-highlighting/vim/syntax/meson.vim index 1b576d9..a1679e0 100644 --- a/data/syntax-highlighting/vim/syntax/meson.vim +++ b/data/syntax-highlighting/vim/syntax/meson.vim @@ -3,7 +3,7 @@ " License: VIM License " Maintainer: Nirbheek Chauhan <nirbheek.chauhan@gmail.com> " Liam Beguin <liambeguin@gmail.com> -" Last Change: 2021 Aug 16 +" Last Change: 2023 Aug 27 " Credits: Zvezdan Petkovic <zpetkovic@acm.org> " Neil Schemenauer <nas@meson.ca> " Dmitry Vasiliev @@ -64,6 +64,11 @@ syn keyword mesonBoolean false true " Built-in functions syn keyword mesonBuiltin + \ build_machine + \ host_machine + \ meson + \ option + \ target_machine \ add_global_arguments \ add_global_link_arguments \ add_languages @@ -75,11 +80,11 @@ syn keyword mesonBuiltin \ assert \ benchmark \ both_libraries - \ build_machine \ build_target \ configuration_data \ configure_file \ custom_target + \ debug \ declare_dependency \ dependency \ disabler @@ -87,30 +92,26 @@ syn keyword mesonBuiltin \ error \ executable \ files - \ find_library \ find_program \ generator \ get_option \ get_variable - \ gettext - \ host_machine \ import \ include_directories \ install_data + \ install_emptydir \ install_headers \ install_man \ install_subdir \ install_symlink - \ install_emptydir \ is_disabler \ is_variable \ jar \ join_paths \ library - \ meson \ message - \ option \ project + \ range \ run_command \ run_target \ set_variable @@ -122,13 +123,10 @@ syn keyword mesonBuiltin \ subdir_done \ subproject \ summary - \ target_machine \ test \ unset_variable \ vcs_tag \ warning - \ range - \ debug if exists("meson_space_error_highlight") " trailing whitespace diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index 70a4f1f..9e098d0 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -148,14 +148,12 @@ class AstInterpreter(InterpreterBase): 'is_disabler': self.func_do_nothing, 'is_variable': self.func_do_nothing, 'disabler': self.func_do_nothing, - 'gettext': self.func_do_nothing, 'jar': self.func_do_nothing, 'warning': self.func_do_nothing, 'shared_module': self.func_do_nothing, 'option': self.func_do_nothing, 'both_libraries': self.func_do_nothing, 'add_test_setup': self.func_do_nothing, - 'find_library': self.func_do_nothing, 'subdir_done': self.func_do_nothing, 'alias_target': self.func_do_nothing, 'summary': self.func_do_nothing, diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 0ba8dc7..5657b20 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -372,12 +372,10 @@ class Interpreter(InterpreterBase, HoldableObject): 'error': self.func_error, 'executable': self.func_executable, 'files': self.func_files, - 'find_library': self.func_find_library, 'find_program': self.func_find_program, 'generator': self.func_generator, 'get_option': self.func_get_option, 'get_variable': self.func_get_variable, - 'gettext': self.func_gettext, 'import': self.func_import, 'include_directories': self.func_include_directories, 'install_data': self.func_install_data, @@ -848,9 +846,6 @@ class Interpreter(InterpreterBase, HoldableObject): self.environment.get_build_command() + ['introspect'], in_builddir=in_builddir, check=check, capture=capture) - def func_gettext(self, nodes, args, kwargs): - raise InterpreterException('Gettext() function has been moved to module i18n. Import it and use i18n.gettext() instead') - def func_option(self, nodes, args, kwargs): raise InterpreterException('Tried to call option() in build description file. All options must be in the option file.') @@ -1754,12 +1749,6 @@ class Interpreter(InterpreterBase, HoldableObject): silent=False, wanted=kwargs['version'], search_dirs=search_dirs) - def func_find_library(self, node, args, kwargs): - raise InvalidCode('find_library() is removed, use meson.get_compiler(\'name\').find_library() instead.\n' - 'Look here for documentation: http://mesonbuild.com/Reference-manual.html#compiler-object\n' - 'Look here for example: http://mesonbuild.com/howtox.html#add-math-library-lm-portably\n' - ) - # When adding kwargs, please check if they make sense in dependencies.get_dep_identifier() @FeatureNewKwargs('dependency', '0.57.0', ['cmake_package_version']) @FeatureNewKwargs('dependency', '0.56.0', ['allow_fallback']) |