diff options
| author | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2016-10-24 17:05:35 -0400 |
|---|---|---|
| committer | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2016-10-24 18:01:27 -0400 |
| commit | 114b5b063792753f8bc0648368a0bdcc040f2d81 (patch) | |
| tree | f9be720f332387aa0738ca39f866f384102c8168 | |
| parent | ff6b3c7a2d5cecb00ad60397b50e319b73461752 (diff) | |
| download | meson-114b5b063792753f8bc0648368a0bdcc040f2d81.zip meson-114b5b063792753f8bc0648368a0bdcc040f2d81.tar.gz meson-114b5b063792753f8bc0648368a0bdcc040f2d81.tar.bz2 | |
vala: Use 'vala_header' and 'vala_vapi' directly
Move the fallback logic into 'BuildTarget.process_kwargs' to use the
target name instead.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 | ||||
| -rw-r--r-- | mesonbuild/build.py | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 6c99fb1..92503db 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -992,15 +992,14 @@ int dummy; # Library name args += ['--library=' + target.name] # Outputted header - hname = os.path.join(self.get_target_dir(target), target.vala_header if isinstance(target.vala_header, str) else (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.vala_vapi if isinstance(target.vala_vapi, str) else (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=../' + 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 75766fd..0362163 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -452,8 +452,8 @@ class BuildTarget(): valalist = [valalist] self.add_compiler_args('vala', valalist) if not isinstance(self, Executable): - self.vala_header = kwargs.get('vala_header', None) - self.vala_vapi = kwargs.get('vala_vapi', None) + 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', []) |