diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-16 20:42:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-16 20:42:37 +0300 |
| commit | 217e0593ca3ad42aebdb5decfe3649abea45b957 (patch) | |
| tree | 4b337554c0df5ca8765b8cb982fe289660e819e4 | |
| parent | c631cac04c59f6ce741ddcf32754fb260042ffec (diff) | |
| parent | c76837a3d7343908e8980dcf2f8f4cb21a013be3 (diff) | |
| download | meson-217e0593ca3ad42aebdb5decfe3649abea45b957.zip meson-217e0593ca3ad42aebdb5decfe3649abea45b957.tar.gz meson-217e0593ca3ad42aebdb5decfe3649abea45b957.tar.bz2 | |
Merge pull request #594 from ssssam/sam/vala-target-name
Use target name to decide generated Vala .h & .vapi filenames
| -rw-r--r-- | authors.txt | 1 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/authors.txt b/authors.txt index eadd2ff..08c046d 100644 --- a/authors.txt +++ b/authors.txt @@ -35,3 +35,4 @@ Rogiel Sulzbach Tim-Philipp Müller Emmanuele Bassi Martin Hostettler +Sam Thursfield diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index b3f3f17..9ceee32 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -772,7 +772,7 @@ int dummy; if hasattr(i, 'fname'): i = i.fname if i.endswith('vala'): - vapiname = os.path.splitext(os.path.split(i)[1])[0] + '.vapi' + vapiname = dep.name + '.vapi' fullname = os.path.join(self.get_target_dir(dep), vapiname) result.append(fullname) break @@ -790,7 +790,7 @@ int dummy; vala_input_files.append(s.rel_to_builddir(self.build_to_src)) if len(src) == 0: raise InvalidArguments('Vala library has no Vala source files.') - namebase = os.path.splitext(os.path.split(src[0].fname)[1])[0] + namebase = target.name base_h = namebase + '.h' base_vapi = namebase + '.vapi' hname = os.path.normpath(os.path.join(self.get_target_dir(target), base_h)) |