Use target name to decide generated Vala .h & .vapi filenames #594
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Seems reasonable. Please add yourself to |
Previously Meson would use the name of the first .vala source file. This doesn't work for some projects. Tracker is one example: it has several libraries that mix Vala and C code. In such cases, none of the .vala files tend to bear the name of the library we actually want to generate.
ssssam
force-pushed
the
sam/vala-target-name
branch
from
7393de2
to
c76837a
Compare
| @@ -790,7 +790,7 @@ def generate_vala_compile(self, compiler, target, outfile): | |||
| 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' | |||
There was a problem hiding this comment.
This is problematic because we generally want the header to be installed in a folder named from the target name (e.g. foo-1.0/foo.h), not the file itself. I think that we should strip the -MAJOR.MINOR suffix for generating base_h.
For other files (GIR, deps, VAPI, ...) that's fine since it's already the convention.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously Meson would use the name of the first .vala source file. This
doesn't work for some projects. Tracker is one example: it has
several libraries that mix Vala and C code. In such cases, none of the
.vala files tend to bear the name of the library we actually want to
generate.
This fixes #504