Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2004 from valum-framework/add-display-language 

More usages of 'get_display_language' and a fix for C#
This commit is contained in:
Jussi Pakkanen 2017-06-27 04:12:48 -04:00 committed by GitHub
parent 80ebc916f7 bbddf51a54
commit e630d899da
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mesonbuild/compilers/compilers.py
View File

@ -622,28 +622,28 @@ class Compiler:
return [] return []
def has_header(self, *args, **kwargs): def has_header(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support header checks.' % self.language) raise EnvironmentException('Language %s does not support header checks.' % self.get_display_language())
def has_header_symbol(self, *args, **kwargs): def has_header_symbol(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support header symbol checks.' % self.language) raise EnvironmentException('Language %s does not support header symbol checks.' % self.get_display_language())
def compiles(self, *args, **kwargs): def compiles(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support compile checks.' % self.language) raise EnvironmentException('Language %s does not support compile checks.' % self.get_display_language())
def links(self, *args, **kwargs): def links(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support link checks.' % self.language) raise EnvironmentException('Language %s does not support link checks.' % self.get_display_language())
def run(self, *args, **kwargs): def run(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support run checks.' % self.language) raise EnvironmentException('Language %s does not support run checks.' % self.get_display_language())
def sizeof(self, *args, **kwargs): def sizeof(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support sizeof checks.' % self.language) raise EnvironmentException('Language %s does not support sizeof checks.' % self.get_display_language())
def alignment(self, *args, **kwargs): def alignment(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support alignment checks.' % self.language) raise EnvironmentException('Language %s does not support alignment checks.' % self.get_display_language())
def has_function(self, *args, **kwargs): def has_function(self, *args, **kwargs):
raise EnvironmentException('Language %s does not support function checks.' % self.language) raise EnvironmentException('Language %s does not support function checks.' % self.get_display_language())
@classmethod @classmethod
def unix_args_to_native(cls, args): def unix_args_to_native(cls, args):
@ -651,7 +651,7 @@ class Compiler:
return args[:] return args[:]
def find_library(self, *args, **kwargs): def find_library(self, *args, **kwargs):
raise EnvironmentException('Language {} does not support library finding.'.format(self.language)) raise EnvironmentException('Language {} does not support library finding.'.format(self.get_display_language()))
def get_library_dirs(self): def get_library_dirs(self):
return [] return []
@ -662,7 +662,7 @@ class Compiler:
def has_multi_arguments(self, args, env): def has_multi_arguments(self, args, env):
raise EnvironmentException( raise EnvironmentException(
'Language {} does not support has_multi_arguments.'.format( 'Language {} does not support has_multi_arguments.'.format(
self.language)) self.get_display_language()))
def get_cross_extra_flags(self, environment, link): def get_cross_extra_flags(self, environment, link):
extra_flags = [] extra_flags = []
@ -753,7 +753,7 @@ class Compiler:
def get_link_whole_for(self, args): def get_link_whole_for(self, args):
if isinstance(args, list) and not args: if isinstance(args, list) and not args:
return [] return []
raise EnvironmentException('Language %s does not support linking whole archives.' % self.language) raise EnvironmentException('Language %s does not support linking whole archives.' % self.get_display_language())
def build_unix_rpath_args(self, build_dir, from_dir, rpath_paths, install_rpath): def build_unix_rpath_args(self, build_dir, from_dir, rpath_paths, install_rpath):
if not rpath_paths and not install_rpath: if not rpath_paths and not install_rpath:

2
mesonbuild/compilers/cs.py
View File

@ -26,7 +26,7 @@ class MonoCompiler(Compiler):
self.monorunner = 'mono' self.monorunner = 'mono'
def get_display_language(self): def get_display_language(self):
return 'C#' return 'C sharp'
def get_output_args(self, fname): def get_output_args(self, fname):
return ['-out:' + fname] return ['-out:' + fname]