summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/java.py
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2023-12-01 13:55:09 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2023-12-23 13:32:49 +0200
commit4761e4cad946b42daa8723672957e9c1eaeaa5be (patch)
tree328144b20f11726c407cd60e037c372cb279e32d /mesonbuild/compilers/java.py
parent360d81e4aa3eb1230997a7a1c74130bca00fd896 (diff)
downloadmeson-4761e4cad946b42daa8723672957e9c1eaeaa5be.tar.gz
Remove `get_buildtype_args` function
This is a first step to make `buildtype` a true alias of `debug` and `optimization` options. See #10808. Relates to: - #11645 - #12096 - #5920 - #5814 - #8220 - #8493 - #9540 - #10487 - #12265 - #8308 - #8214 - #7194 - #11732
Diffstat (limited to 'mesonbuild/compilers/java.py')
-rw-r--r--mesonbuild/compilers/java.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py
index d063554eb..540e2aa78 100644
--- a/mesonbuild/compilers/java.py
+++ b/mesonbuild/compilers/java.py
@@ -11,7 +11,7 @@ import textwrap
import typing as T
from ..mesonlib import EnvironmentException
-from .compilers import Compiler, java_buildtype_args
+from .compilers import Compiler
from .mixins.islinker import BasicLinkerIsCompilerMixin
if T.TYPE_CHECKING:
@@ -19,6 +19,12 @@ if T.TYPE_CHECKING:
from ..environment import Environment
from ..mesonlib import MachineChoice
+
+java_debug_args: T.Dict[bool, T.List[str]] = {
+ False: ['-g:none'],
+ True: ['-g']
+}
+
class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler):
language = 'java'
@@ -56,9 +62,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler):
def get_pch_name(self, name: str) -> str:
return ''
- def get_buildtype_args(self, buildtype: str) -> T.List[str]:
- return java_buildtype_args[buildtype]
-
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):
@@ -107,6 +110,4 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler):
return []
def get_debug_args(self, is_debug: bool) -> T.List[str]:
- if is_debug:
- return ['-g']
- return ['-g:none']
+ return java_debug_args[is_debug]