add support for meson build system #57
Merged
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
acrisci
reviewed
Mar 11, 2018
meson_options.txt
Outdated
| @@ -0,0 +1,2 @@ | |||
| #option('gtk-doc', type: 'boolean', value: false, description: 'build docs') | |||
| option('introspection', type: 'boolean', value: false, description: 'build gir data') | |||
There was a problem hiding this comment.
should be generated by default.
|
Cool, you can remove the old build system when you are done 👍 . |
|
IMO it makes sense to keep the old one for at least one release, just in case something is broken with the meson implementation after all :) |
|
Okay, I've added the stuff I've done so far for gtk-doc, but it still fails ( although I think that I've copied everything from Makefile.am ) Full logs: Configuration: Building: The actual error message by gtk-doc: |
|
Did you run |
|
Just tried it, exactly the same happens ( and gtk-doc.m4 doesn't contain anything that's not set in the respective meson.build file, I think ) |
|
The source of the problem seems to be in the <chapter id="object-tree">
<title>Object Hierarchy</title>
<xi:include href="xml/tree_index.sgml"/>
</chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
</index>
<index id="deprecated-api-index" role="deprecated">
<title>Index of deprecated API</title>
<xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
</index>Look at this example for how to do gtkdoc and try to do what they do and let me know how it goes. |
|
Okay, seems like I've figured that one out, forgot to generate the GIR related docs |
|
Okay, it almost works now, I only have to figure out how to link against the shared library that's built and then everything should be set |
|
Everything should work now :) Please squash the commits before merging, I just like to use fixup commits on github, so that one can track what actually changed in the PR :) |
|
How do you make the docs? |
|
I simply do them during install:
But that shouldn't change anything. It works for me, so I guess one of of us is using an older version of gtk-doc or meson. What versions do you use? I'm using Meson 0.45 and gtk-doc 1.25 myself |
|
Removing that flag works for me, does it work for you? diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index c008471..8df2fad 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -14,7 +14,6 @@ gnome.gtkdoc(
playerctl_shared_link,
],
mkdb_args: [
- '--sgml-mode',
'--output-format=xml',
'--name-space=meson.project_name()',
], |
|
Alright, still works. Do mind however that we passed |
|
Cool looks good thanks 👍 |
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.
This PR adds support for meson to playerctl. It works fine for everything but gtk-doc for me, still messing with that