Alphabetization.

pull/2001/head
Jussi Pakkanen 8 years ago
parent 97b7a7b10e
commit fe74c54079
  1. 134
      mesonbuild/interpreter.py

@ -1217,39 +1217,39 @@ pch_kwargs = set(['c_pch', 'cpp_pch'])
lang_arg_kwargs = set(['c_args', lang_arg_kwargs = set(['c_args',
'cpp_args', 'cpp_args',
'd_args',
'fortran_args',
'java_args', 'java_args',
'rust_args',
'objc_args', 'objc_args',
'objcpp_args', 'objcpp_args',
'fortran_args', 'rust_args',
'vala_args', 'vala_args',
'd_args',
]) ])
vala_kwargs = set(['vala_header', 'vala_gir', 'vala_vapi']) vala_kwargs = set(['vala_header', 'vala_gir', 'vala_vapi'])
rust_kwargs = set(['rust_crate_type']) rust_kwargs = set(['rust_crate_type'])
cs_kwargs = set(['resources']) cs_kwargs = set(['resources'])
buildtarget_kwargs = set(['sources', buildtarget_kwargs = set(['build_by_default',
'dependencies',
'extra_files',
'gui_app',
'link_with', 'link_with',
'link_whole', 'link_whole',
'link_args', 'link_args',
'link_depends', 'link_depends',
'include_directories', 'include_directories',
'dependencies',
'gui_app',
'extra_files',
'install', 'install',
'install_rpath', 'install_rpath',
'install_dir', 'install_dir',
'objects',
'native',
'name_suffix',
'name_prefix', 'name_prefix',
'build_by_default', 'name_suffix',
'vs_module_defs', 'native',
'pic', 'objects',
'override_options', 'override_options',
'pic',
'sources',
'vs_module_defs',
]) ])
build_target_common_kwargs = set() build_target_common_kwargs = set()
@ -1275,33 +1275,33 @@ jar_kwargs.update(['main_class'])
build_target_kwargs = exe_kwargs.copy() build_target_kwargs = exe_kwargs.copy()
build_target_kwargs.update(['target_type']) build_target_kwargs.update(['target_type'])
permitted_kwargs = {'project': set(['version', 'meson_version', 'default_options', 'license', 'subproject_dir']), permitted_kwargs = {'add_global_arguments': set(['language']),
'executable': exe_kwargs, 'add_languages': set(['required']),
'shared_library': shlib_kwargs, 'add_project_arguments': set(['language']),
'static_library': stlib_kwargs, 'add_test_setup': set(['exe_wrapper', 'gdb', 'timeout_multiplier', 'env']),
'shared_module': shmod_kwargs, 'benchmark': set(['args', 'env', 'should_fail', 'timeout', 'workdir', 'suite']),
'jar': jar_kwargs,
'build_target': build_target_kwargs, 'build_target': build_target_kwargs,
'configure_file': set(['input', 'output', 'configuration', 'command', 'install_dir', 'capture', 'install']),
'custom_target': set(['input', 'output', 'command', 'install', 'install_dir', 'build_always', 'capture', 'depends', 'depend_files', 'depfile', 'build_by_default']), 'custom_target': set(['input', 'output', 'command', 'install', 'install_dir', 'build_always', 'capture', 'depends', 'depend_files', 'depfile', 'build_by_default']),
'run_target': set(['command', 'depends']), 'declare_dependency': set(['include_directories', 'link_with', 'sources', 'dependencies', 'compile_args', 'link_args', 'version']),
'executable': exe_kwargs,
'find_program': set(['required',]),
'generator': set(['arguments', 'output', 'depfile']), 'generator': set(['arguments', 'output', 'depfile']),
'test': set(['args', 'env', 'is_parallel', 'should_fail', 'timeout', 'workdir', 'suite']), 'include_directories': set(['is_system']),
'benchmark': set(['args', 'env', 'should_fail', 'timeout', 'workdir', 'suite']), 'install_data': set(['install_dir', 'install_mode', 'sources']),
'install_headers': set(['install_dir', 'subdir']), 'install_headers': set(['install_dir', 'subdir']),
'install_man': set(['install_dir']), 'install_man': set(['install_dir']),
'install_data': set(['install_dir', 'install_mode', 'sources']),
'install_subdir': set(['install_dir', 'install_mode']), 'install_subdir': set(['install_dir', 'install_mode']),
'configure_file': set(['input', 'output', 'configuration', 'command', 'install_dir', 'capture', 'install']), 'jar': jar_kwargs,
'include_directories': set(['is_system']), 'project': set(['version', 'meson_version', 'default_options', 'license', 'subproject_dir']),
'add_global_arguments': set(['language']),
'add_project_arguments': set(['language']),
'add_test_setup': set(['exe_wrapper', 'gdb', 'timeout_multiplier', 'env']),
'add_languages': set(['required']),
'find_program': set(['required',]),
'run_command': set(['in_builddir']), # INTERNAL 'run_command': set(['in_builddir']), # INTERNAL
'run_target': set(['command', 'depends']),
'shared_library': shlib_kwargs,
'shared_module': shmod_kwargs,
'static_library': stlib_kwargs,
'subproject': set(['version', 'default_options']), 'subproject': set(['version', 'default_options']),
'test': set(['args', 'env', 'is_parallel', 'should_fail', 'timeout', 'workdir', 'suite']),
'vcs_tag': set(['input', 'output', 'fallback', 'command', 'replace_string']), 'vcs_tag': set(['input', 'output', 'fallback', 'command', 'replace_string']),
'declare_dependency': set(['include_directories', 'link_with', 'sources', 'dependencies', 'compile_args', 'link_args', 'version']),
} }
@ -1346,53 +1346,53 @@ class Interpreter(InterpreterBase):
self.build_def_files = [os.path.join(self.subdir, environment.build_filename)] self.build_def_files = [os.path.join(self.subdir, environment.build_filename)]
def build_func_dict(self): def build_func_dict(self):
self.funcs.update({'project': self.func_project, self.funcs.update({'add_global_arguments': self.func_add_global_arguments,
'message': self.func_message,
'error': self.func_error,
'executable': self.func_executable,
'dependency': self.func_dependency,
'static_library': self.func_static_lib,
'shared_library': self.func_shared_lib,
'shared_module': self.func_shared_module,
'library': self.func_library,
'jar': self.func_jar,
'build_target': self.func_build_target,
'custom_target': self.func_custom_target,
'run_target': self.func_run_target,
'generator': self.func_generator,
'test': self.func_test,
'benchmark': self.func_benchmark,
'install_headers': self.func_install_headers,
'install_man': self.func_install_man,
'subdir': self.func_subdir,
'install_data': self.func_install_data,
'install_subdir': self.func_install_subdir,
'configure_file': self.func_configure_file,
'include_directories': self.func_include_directories,
'add_global_arguments': self.func_add_global_arguments,
'add_project_arguments': self.func_add_project_arguments, 'add_project_arguments': self.func_add_project_arguments,
'add_global_link_arguments': self.func_add_global_link_arguments, 'add_global_link_arguments': self.func_add_global_link_arguments,
'add_project_link_arguments': self.func_add_project_link_arguments, 'add_project_link_arguments': self.func_add_project_link_arguments,
'add_test_setup': self.func_add_test_setup, 'add_test_setup': self.func_add_test_setup,
'add_languages': self.func_add_languages, 'add_languages': self.func_add_languages,
'find_program': self.func_find_program, 'assert': self.func_assert,
'find_library': self.func_find_library, 'benchmark': self.func_benchmark,
'build_target': self.func_build_target,
'configuration_data': self.func_configuration_data, 'configuration_data': self.func_configuration_data,
'run_command': self.func_run_command, 'configure_file': self.func_configure_file,
'custom_target': self.func_custom_target,
'declare_dependency': self.func_declare_dependency,
'dependency': self.func_dependency,
'environment': self.func_environment,
'error': self.func_error,
'executable': self.func_executable,
'generator': self.func_generator,
'gettext': self.func_gettext, 'gettext': self.func_gettext,
'option': self.func_option,
'get_option': self.func_get_option, 'get_option': self.func_get_option,
'subproject': self.func_subproject,
'vcs_tag': self.func_vcs_tag,
'set_variable': self.func_set_variable,
'is_variable': self.func_is_variable,
'get_variable': self.func_get_variable, 'get_variable': self.func_get_variable,
'import': self.func_import,
'files': self.func_files, 'files': self.func_files,
'declare_dependency': self.func_declare_dependency, 'find_library': self.func_find_library,
'assert': self.func_assert, 'find_program': self.func_find_program,
'environment': self.func_environment, 'include_directories': self.func_include_directories,
'import': self.func_import,
'install_data': self.func_install_data,
'install_headers': self.func_install_headers,
'install_man': self.func_install_man,
'install_subdir': self.func_install_subdir,
'is_variable': self.func_is_variable,
'jar': self.func_jar,
'join_paths': self.func_join_paths, 'join_paths': self.func_join_paths,
'library': self.func_library,
'message': self.func_message,
'option': self.func_option,
'project': self.func_project,
'run_target': self.func_run_target,
'run_command': self.func_run_command,
'set_variable': self.func_set_variable,
'subdir': self.func_subdir,
'subproject': self.func_subproject,
'shared_library': self.func_shared_lib,
'shared_module': self.func_shared_module,
'static_library': self.func_static_lib,
'test': self.func_test,
'vcs_tag': self.func_vcs_tag,
}) })
def holderify(self, item): def holderify(self, item):

Loading…
Cancel
Save