diff options
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 | ||||
| -rw-r--r-- | mesonbuild/build.py | 5 | ||||
| -rw-r--r-- | test cases/vala/12 custom output/foo.vala | 0 | ||||
| -rw-r--r-- | test cases/vala/12 custom output/meson.build | 9 |
4 files changed, 17 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index f826f89..1c856a1 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1027,15 +1027,14 @@ int dummy; # Library name args += ['--library=' + target.name] # Outputted header - hname = os.path.join(self.get_target_dir(target), target.name + '.h') + hname = os.path.join(self.get_target_dir(target), target.vala_header) args += ['-H', hname] valac_outputs.append(hname) # Outputted vapi file - base_vapi = target.name + '.vapi' - vapiname = os.path.join(self.get_target_dir(target), base_vapi) + vapiname = os.path.join(self.get_target_dir(target), target.vala_vapi) # Force valac to write the vapi file in the target build dir. # Without this, it will write it inside c_out_dir - args += ['--vapi=../' + base_vapi] + args += ['--vapi', os.path.join('..', target.vala_vapi)] valac_outputs.append(vapiname) if self.environment.coredata.get_builtin_option('werror'): args += valac.get_werror_args() diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 0ecc94a..1d687d8 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -55,6 +55,8 @@ known_lib_kwargs.update({'version' : True, # Only for shared libs 'name_prefix' : True, 'name_suffix' : True, 'vs_module_defs' : True, # Only for shared libs + 'vala_header': True, + 'vala_vapi': True, 'pic' : True, # Only for static libs }) @@ -493,6 +495,9 @@ class BuildTarget(): if not isinstance(valalist, list): valalist = [valalist] self.add_compiler_args('vala', valalist) + if not isinstance(self, Executable): + self.vala_header = kwargs.get('vala_header', self.name + '.h') + self.vala_vapi = kwargs.get('vala_vapi', self.name + '.vapi') dlist = stringlistify(kwargs.get('d_args', [])) self.add_compiler_args('d', dlist) self.link_args = kwargs.get('link_args', []) diff --git a/test cases/vala/12 custom output/foo.vala b/test cases/vala/12 custom output/foo.vala new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/vala/12 custom output/foo.vala diff --git a/test cases/vala/12 custom output/meson.build b/test cases/vala/12 custom output/meson.build new file mode 100644 index 0000000..ef6dbb5 --- /dev/null +++ b/test cases/vala/12 custom output/meson.build @@ -0,0 +1,9 @@ +project('valatest', 'c', 'vala') + +glib = dependency('glib-2.0') +gobject = dependency('gobject-2.0') + +library('foo-1.0', 'foo.vala', + vala_header: 'foo.h', + vala_vapi: 'foo.vapi', + dependencies: [glib, gobject]) |