From 5a7427cebb9093387f3f5e202b033db2516f9b30 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Fri, 23 Sep 2022 14:30:23 -0500 Subject: Fix mismatched param names between Compiler and BasicLinkerIsCompilerMixin --- mesonbuild/compilers/java.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 536780b..6857ea0 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -34,13 +34,20 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): language = 'java' id = 'unknown' + _WARNING_LEVELS: T.Dict[str, T.List[str]] = { + '0': ['-nowarn'], + '1': ['-Xlint:all'], + '2': ['-Xlint:all', '-Xdoclint:all'], + '3': ['-Xlint:all', '-Xdoclint:all'], + } + def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, info: 'MachineInfo', full_version: T.Optional[str] = None): super().__init__(exelist, version, for_machine, info, full_version=full_version) self.javarunner = 'java' def get_warn_args(self, level: str) -> T.List[str]: - return ['-Xlint:all', '-Xdoclint:all'] + return self._WARNING_LEVELS[level] def get_werror_args(self) -> T.List[str]: return ['-Werror'] @@ -65,9 +72,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): def get_buildtype_args(self, buildtype: str) -> T.List[str]: return java_buildtype_args[buildtype] - def get_depfile_suffix(self) -> str: - return 'd' - def compute_parameters_with_absolute_paths(self, parameter_list: T.List[str], build_dir: str) -> T.List[str]: for idx, i in enumerate(parameter_list): -- cgit v1.1