diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2018-11-29 12:56:52 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-06 12:19:28 +0100 |
| commit | c4eb5c79fe89ca49dd9d9f5bd72be99d919dd2a0 (patch) | |
| tree | d32bb616886be379b602760ac8f42095a8f4ad0d /mesonbuild | |
| parent | 24d668bea06b3b953855fa12ef2f5b417d4dd163 (diff) | |
| download | meson-c4eb5c79fe89ca49dd9d9f5bd72be99d919dd2a0.zip meson-c4eb5c79fe89ca49dd9d9f5bd72be99d919dd2a0.tar.gz meson-c4eb5c79fe89ca49dd9d9f5bd72be99d919dd2a0.tar.bz2 | |
Added unit test
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/cs.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/java.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/swift.py | 2 | ||||
| -rw-r--r-- | mesonbuild/msetup.py | 3 |
5 files changed, 4 insertions, 7 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 1054451..4fa6bde 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1515,7 +1515,6 @@ class SharedLibrary(BuildTarget): known_kwargs = known_shlib_kwargs def __init__(self, name, subdir, subproject, is_cross, sources, objects, environment, kwargs): - self.typename = 'shared library' self.soversion = None self.ltversion = None # Max length 2, first element is compatibility_version, second is current_version @@ -1528,6 +1527,7 @@ class SharedLibrary(BuildTarget): # The import library that GCC would generate (and prefer) self.gcc_import_filename = None super().__init__(name, subdir, subproject, is_cross, sources, objects, environment, kwargs) + self.typename = 'shared library' if 'rust' in self.compilers: # If no crate type is specified, or it's the generic lib type, use dylib if not hasattr(self, 'rust_crate_type') or self.rust_crate_type == 'lib': diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py index 95b1603..a6c74d2 100644 --- a/mesonbuild/compilers/cs.py +++ b/mesonbuild/compilers/cs.py @@ -82,7 +82,7 @@ class CsCompiler(Compiler): def get_std_exe_link_args(self): return [] - def get_include_args(self, path, is_system): + def get_include_args(self, path): return [] def get_pic_args(self): diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 686d2e0..978562c 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -63,7 +63,7 @@ class JavaCompiler(Compiler): def get_std_exe_link_args(self): return [] - def get_include_args(self, path, is_system): + def get_include_args(self, path): return [] def get_pic_args(self): diff --git a/mesonbuild/compilers/swift.py b/mesonbuild/compilers/swift.py index c156541..4d5dd0c 100644 --- a/mesonbuild/compilers/swift.py +++ b/mesonbuild/compilers/swift.py @@ -85,7 +85,7 @@ class SwiftCompiler(Compiler): def build_rpath_args(self, *args): return [] # FIXME - def get_include_args(self, dirname, is_system): + def get_include_args(self, dirname): return ['-I' + dirname] def get_compile_only_args(self): diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 491ea2f..402f756 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -218,9 +218,6 @@ class MesonApp: coredata.update_cmd_line_file(self.build_dir, self.options) # Generate an IDE introspection file with the same syntax as the already existing API - intro_tests = intr.backend.create_test_serialisation(b.get_tests()) - intro_benchmarks = intr.backend.create_test_serialisation(b.get_benchmarks()) - intro_install = intr.backend.create_install_data() if self.options.profile: fname = os.path.join(self.build_dir, 'meson-private', 'profile-introspector.log') profile.runctx('mintro.generate_introspection_file(b, intr.backend)', globals(), locals(), filename=fname) |