Bug 567906 - Put pkg-config dependencies in .gir files

When generating a .gir file, we now first parse all of our .gir includes
to pick up their <package> headers.  Then, we merge that with the set of
--pkg arguments passed to us, run pkg-config to gather the arguments,
and finally save the merged pkg-config list to our new .gir file.

This is useful for software which needs to map from .gir to pkg-config
in a programmatic way.

1 files changed, 15 insertions, 4 deletions

diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 657063e6..35c9b35e 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -33,15 +33,20 @@ from .xmlwriter import XMLWriter
 
 class GIRWriter(XMLWriter):
 
-    def __init__(self, namespace, shlibs, includes):
+    def __init__(self, namespace, shlibs, includes, pkgs):
         super(GIRWriter, self).__init__()
         self.write_comment(
 '''This file was automatically generated from C sources - DO NOT EDIT!
 To affect the contents of this file, edit the original C definitions,
 and/or use gtk-doc annotations. ''')
-        self._write_repository(namespace, shlibs, includes)
-
-    def _write_repository(self, namespace, shlibs, includes=set()):
+        self._write_repository(namespace, shlibs, includes, pkgs)
+
+    def _write_repository(self, namespace, shlibs, includes=None,
+                          packages=None):
+        if includes is None:
+            includes = frozenset()
+        if packages is None:
+            packages = frozenset()
         attrs = [
             ('version', '1.0'),
             ('xmlns', 'http://www.gtk.org/introspection/core/1.0'),
@@ -51,12 +56,18 @@ and/or use gtk-doc annotations. ''')
         with self.tagcontext('repository', attrs):
             for include in sorted(includes):
                 self._write_include(include)
+            for pkg in sorted(set(packages)):
+                self._write_pkgconfig_pkg(pkg)
             self._write_namespace(namespace, shlibs)
 
     def _write_include(self, include):
         attrs = [('name', include.name), ('version', include.version)]
         self.write_tag('include', attrs)
 
+    def _write_pkgconfig_pkg(self, package):
+        attrs = [('name', package)]
+        self.write_tag('package', attrs)
+
     def _write_namespace(self, namespace, shlibs):
         libraries = []
         for l in shlibs: