From 1513aa437dd397934eff176c81d742a78e54ddb9 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 Sep 2020 10:49:46 -0700 Subject: compilers: move split_shlib_to_parts to the base compiler Only the GnuLikeCompiler overrides this, and it's implemented multiple places --- mesonbuild/compilers/java.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 8405b43..e353950 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -37,9 +37,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): def get_werror_args(self): return ['-Werror'] - def split_shlib_to_parts(self, fname): - return None, fname - def get_dependency_gen_args(self, outtarget, outfile): return [] -- cgit v1.1 From e7f0890cb9a26e2e64e79739c80fddb609d484cf Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 Sep 2020 10:54:16 -0700 Subject: compilers: move get_dependency_gen_args to base Compiler So that every subclass doesn't have to reimplement it. Especially since the Gnu implementation moved out of the CCompiler and into the GnuLikeCompiler mixin --- mesonbuild/compilers/java.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index e353950..fb4ff7c 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -37,9 +37,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): def get_werror_args(self): return ['-Werror'] - def get_dependency_gen_args(self, outtarget, outfile): - return [] - def get_compile_only_args(self): return [] -- cgit v1.1 From d3a059b55fac4e9cc3c7c306b2e6a4cf5e424aad Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 22 Sep 2020 15:18:24 -0700 Subject: compilers/cuda: make type safe --- mesonbuild/compilers/java.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index fb4ff7c..3b4d2f5 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -48,12 +48,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): def get_coverage_args(self): return [] - def get_std_exe_link_args(self): - return [] - - def get_include_args(self, path): - return [] - def get_pic_args(self): return [] -- cgit v1.1 From 3fc37fc13e12779343ddaf830ebde7e096f77a41 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 28 Sep 2020 10:21:46 -0700 Subject: compilers/java: Add type annotations --- mesonbuild/compilers/java.py | 46 +++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 3b4d2f5..895173e 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -15,6 +15,7 @@ import os.path import shutil import subprocess +import textwrap import typing as T from ..mesonlib import EnvironmentException, MachineChoice @@ -23,44 +24,40 @@ from .mixins.islinker import BasicLinkerIsCompilerMixin if T.TYPE_CHECKING: from ..envconfig import MachineInfo + from ..environment import Environment class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): language = 'java' - def __init__(self, exelist, version, for_machine: MachineChoice, - info: 'MachineInfo'): - super().__init__(exelist, version, for_machine, info) + 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.id = 'unknown' self.javarunner = 'java' - def get_werror_args(self): + def get_werror_args(self) -> T.List[str]: return ['-Werror'] - def get_compile_only_args(self): - return [] - - def get_output_args(self, subdir): + def get_output_args(self, subdir: str) -> T.List[str]: if subdir == '': subdir = './' return ['-d', subdir, '-s', subdir] - def get_coverage_args(self): - return [] - - def get_pic_args(self): + def get_pic_args(self) -> T.List[str]: return [] - def get_pch_use_args(self, pch_dir, header): + def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]: return [] - def get_pch_name(self, header_name): + def get_pch_name(self, name: str) -> str: return '' - def get_buildtype_args(self, buildtype): + def get_buildtype_args(self, buildtype: str) -> T.List[str]: return java_buildtype_args[buildtype] - def compute_parameters_with_absolute_paths(self, parameter_list, build_dir): + 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): if i in ['-cp', '-classpath', '-sourcepath'] and idx + 1 < len(parameter_list): path_list = parameter_list[idx + 1].split(os.pathsep) @@ -69,17 +66,18 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): return parameter_list - def sanity_check(self, work_dir, environment): + def sanity_check(self, work_dir: str, environment: 'Environment') -> None: src = 'SanityCheck.java' obj = 'SanityCheck' source_name = os.path.join(work_dir, src) with open(source_name, 'w') as ofile: - ofile.write('''class SanityCheck { - public static void main(String[] args) { - int i; - } -} -''') + ofile.write(textwrap.dedent( + '''class SanityCheck { + public static void main(String[] args) { + int i; + } + } + ''')) pc = subprocess.Popen(self.exelist + [src], cwd=work_dir) pc.wait() if pc.returncode != 0: @@ -99,5 +97,5 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): "all about it." raise EnvironmentException(m) - def needs_static_linker(self): + def needs_static_linker(self) -> bool: return False -- cgit v1.1 From 135f5d5838263e2afd344d916710071037ffcadc Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 29 Sep 2020 09:21:08 -0700 Subject: compilers: make get_optimization_args abstract --- mesonbuild/compilers/java.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mesonbuild/compilers/java.py') diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 895173e..77e1a9b 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -99,3 +99,6 @@ class JavaCompiler(BasicLinkerIsCompilerMixin, Compiler): def needs_static_linker(self) -> bool: return False + + def get_optimization_args(self, optimization_level: str) -> T.List[str]: + return [] -- cgit v1.1