GNOME Bugzilla – Bug 787198
Re-establish vapi generation, rename the vapi to the correct name
Last modified: 2019-02-22 03:52:15 UTC
Here is a branch containing the fix: https://git.gnome.org/browse/libgit2-glib/log/?h=tintou/wip/vala-fix
*** Bug 775810 has been marked as a duplicate of this bug. ***
*** Bug 770910 has been marked as a duplicate of this bug. ***
I have recently done some improvements to the meson ports and uploaded the patches to bug 792699. One of those improvements have been the VAPI generation. However, I still haven't fixed the name as I remembered that there was already a patch in the works. Corentin Noël, would you mind updating the fix to be applied over those patches? I have also created a wip branch[0] with all those patches applied, so you won't have to apply all the patches over upstream. I think that it would be enough to change the `libgit2_glib_ns` variable[1] to the proper name (or just fully replace that variable by using meson.project_name() instead which is used for the `.pc` generation). [0] https://git.gnome.org/browse/libgit2-glib/log/?h=wip/inigomartinez/meson [1] https://git.gnome.org/browse/libgit2-glib/tree/meson.build?h=wip/inigomartinez/meson#n18
I forked your branch and applied the required changes, it even removes one variable in meson, yay!
Thank you! It looks good to me :)
It would make sense to install symlinks for the old naming to preserve backwards compatibility with existing projects.
Created attachment 367553 [details] [review] meson: Create a symlink with the old VAPI name This patch, which is a follow up to the commit that changes the VAPI file name, creates a symlink with the old VAPI name pointing to the new file for backwards compatibility.
Why not just put the symlinks in the source tree and use meson's install_data() ? Note the symlinks need to be relative, so need to include no dir at all.
Created attachment 367556 [details] [review] build: Create a symlink with the old VAPI name (In reply to Rico Tzschichholz from comment #8) > Why not just put the symlinks in the source tree and use meson's > install_data() ? > Note the symlinks need to be relative, so need to include no dir at all. I have changed the links to be relative instead of absolute paths. I have also remembered that autotools is still in place (until buildstream MR is finally merged) and added autotools support. However, in the autotools case, I didn't want to mess very much with the `chdir` trick and followed what other gnome packages do, so absolute link is created.
Created attachment 367990 [details] [review] build: Create a symlink with the old VAPI name I squashed both commits in this one.
Created attachment 367997 [details] [review] Change the VAPI name to follow the pkgconfig one
Created attachment 368070 [details] [review] meson: Create a symlink with the old VAPI name Patch update that only applies to meson (now that autotools has been removed).
Review of attachment 367997 [details] [review]: ok for me
Review of attachment 368070 [details] [review]: OK
attachment 367997 [details] [review] pushed as 363d075 - meson: Make the vapi name follow the pkgconfig name attachment 368070 [details] [review] pushed as 2dd507d - meson: Create a symlink with the old VAPI name