Don't extract annotations from headers

The headers are already parsed as they are passed
in to g-ir-scanner. This avoids quite a few warnings triggered
with the new annotation parser.

diff --git a/misc/update-glib-annotations.py b/misc/update-glib-annotations.py
index 82bd249133f1c0a6bc5101c5f1be7135147a6180..a65ec30efe2b71db3ef6cd61509491bd7d67b19a 100755 (executable)
--- a/misc/update-glib-annotations.py
+++ b/misc/update-glib-annotations.py
@@ -39,22 +39,9 @@ def directory_includes(dirs, srcdir, builddir):
 def extract_annotations(module, srcdir, builddir, outfile):
     sources = []
     subdir = os.path.join(srcdir, module['name'])
-    headersfile = os.path.join(builddir,
-                               module['name'],
-                               module['name'] + '-public-headers.txt')
     includes = directory_includes(module['includes'],
                                   srcdir, builddir)
 
-    f = open(headersfile)
-    line = f.read()
-    f.close()
-
-    for headername in line.split(' '):
-        headername = headername.strip()
-        if headername in module['skip_headers']:
-            continue
-        sources.append(os.path.join(subdir, headername))
-
     for sourcename in os.listdir(subdir):
         if sourcename.endswith('.c'):
             sources.append(os.path.join(subdir, sourcename))
@@ -77,19 +64,16 @@ if __name__ == '__main__':
 
     modules = [{'name':         'glib',
                 'srcname':      '../gir/glib-2.0.c',
-                'skip_headers': ['gi18n-lib.h'],
                 'includes':     ['glib', 'gmodule'],
                 'defines':      ['-DGLIB_COMPILATION']},
 
                {'name':         'gobject',
                 'srcname':      '../gir/gobject-2.0.c',
-                'skip_headers': [],
                 'includes':     ['glib', 'gobject', 'gmodule'],
                 'defines':      ['-DGOBJECT_COMPILATION']},
 
                {'name':         'gio',
                 'srcname':      '../gir/gio-2.0.c',
-                'skip_headers': [],
                 'includes':     ['glib', 'gmodule', 'gobject', 'gio'],
                 'defines':      ['-DGOBJECT_COMPILATION', '-DGIO_COMPILATION']}]