Bug 572075 - Make the scanner work with static and convenience libraries

We need to reference the get_type() functions we are going to dlsym
or otherwise the linker may not include them in the introspection
binary.

giscanner/dumper.py: Accept a list of _get_type() functions
  and write an array referencing them into the introspection
  binary.
giscanner/glibtransformer.py: Break parsing into too stages -
 the stage where we compute the _get_type() functions and the
 stage where we invoke the introspection binary.
tools/g-ir-scanner: Pass _get_type() functions from the
 scanner when creating the introspection binary.

http://bugzilla.gnome.org/show_bug.cgi?id=572075

1 files changed, 11 insertions, 5 deletions

diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index 0cf54cec..f53f7fc3 100755
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -316,17 +316,23 @@ def main(args):
     # Transform the C symbols into AST nodes
     transformer.set_source_ast(ss)
 
+    # Transform the C AST nodes into higher level
+    # GLib/GObject nodes
+    glibtransformer = GLibTransformer(transformer,
+                                      noclosure=options.noclosure)
+
+    # Do enough parsing that we have the get_type() functions to reference
+    # when creating the introspection binary
+    glibtransformer.init_parse()
+
     if options.program:
         args=[options.program]
         args.extend(options.program_args)
         binary = IntrospectionBinary(args)
     else:
-        binary = compile_introspection_binary(options)
+        binary = compile_introspection_binary(options,
+                                              glibtransformer.get_get_type_functions())
 
-    # Transform the C AST nodes into higher level
-    # GLib/GObject nodes
-    glibtransformer = GLibTransformer(transformer,
-                                      noclosure=options.noclosure)
     glibtransformer.set_introspection_binary(binary)
 
     namespace = glibtransformer.parse()