Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New kwargs for gdbus-codegen: sources #3412

Merged
merged 2 commits into from
Apr 20, 2018
Merged

Conversation

nirbheek
Copy link
Member

@nirbheek nirbheek commented Apr 15, 2018

sources: accepts multiple XML files, not just one. For example, glib uses it that way.

Also need depend_files:.

This is required for having glib use the GNOME module once #3218 is merged.

@nirbheek nirbheek changed the title Nirbheek/gdbus codegen sources New kwargs for gdbus-codegen: sources and depend_files Apr 15, 2018
@nirbheek nirbheek force-pushed the nirbheek/gdbus-codegen-sources branch from df22879 to 0b4e542 Compare April 15, 2018 08:33
@jpakkane
Copy link
Member

Why the depend_files? Shouldn't gdbus-codegen write a dep file with exact dependency information?

@nirbheek
Copy link
Member Author

I looked at it again, and in the case of glib, that kwarg is also needed because we don't re-run targets that use gdbus-codegen when some of the internal python files it uses are changed.

I wonder how we can fix this in a generic way.

@nirbheek nirbheek force-pushed the nirbheek/gdbus-codegen-sources branch 3 times, most recently from 1ecd380 to 9d9061c Compare April 20, 2018 15:15
@@ -869,12 +869,13 @@ def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None):
return []

@permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default',
'annotations', 'docbook', 'install_header', 'install_dir'})
'annotations', 'docbook', 'install_header', 'install_dir', 'sources'})
'annotations', 'docbook', 'install', 'install_header'})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Flake8]

[E113] unexpected indentation

@@ -869,12 +869,13 @@ def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None):
return []

@permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default',
'annotations', 'docbook', 'install_header', 'install_dir'})
'annotations', 'docbook', 'install_header', 'install_dir', 'sources'})
'annotations', 'docbook', 'install', 'install_header'})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Flake8]

[E111] indentation is not a multiple of four

@@ -869,12 +869,13 @@ def _unpack_args(arg, kwarg_name, kwargs, expend_file_state=None):
return []

@permittedKwargs({'interface_prefix', 'namespace', 'object_manager', 'build_by_default',
'annotations', 'docbook', 'install_header', 'install_dir'})
'annotations', 'docbook', 'install_header', 'install_dir', 'sources'})
'annotations', 'docbook', 'install', 'install_header'})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Flake8]

[E999] IndentationError: unexpected indent

It accepts multiple XML files, not just one. For example, glib uses
it that way.
@nirbheek nirbheek force-pushed the nirbheek/gdbus-codegen-sources branch from 9d9061c to 45f6a83 Compare April 20, 2018 16:28
@nirbheek nirbheek changed the title New kwargs for gdbus-codegen: sources and depend_files New kwargs for gdbus-codegen: sources Apr 20, 2018
@nirbheek nirbheek added this to the meson-next milestone Apr 20, 2018
@nirbheek nirbheek merged commit 2993eaf into master Apr 20, 2018
@nirbheek nirbheek deleted the nirbheek/gdbus-codegen-sources branch April 20, 2018 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants