diff options
| author | Lucas Rocha <lucasr@gnome.org> | 2008-10-07 21:25:01 +0000 |
|---|---|---|
| committer | Lucas Almeida Rocha <lucasr@src.gnome.org> | 2008-10-07 21:25:01 +0000 |
| commit | 9045f204f1f911867c2dae885904f13f83b9ddab (patch) | |
| tree | 4d58cd7402fe3f87ff1e5f4e1f192bedab286863 /tools | |
| parent | 9103a2f76dc5adac81af724f79a0c2baf425825f (diff) | |
| download | gobject-introspection-9045f204f1f911867c2dae885904f13f83b9ddab.tar.gz | |
Bug 555294: Add support for multiple shared libraries per typelib.
2008-10-06 Lucas Rocha <lucasr@gnome.org>
Bug 555294: Add support for multiple shared libraries per typelib.
* girepository/ginvoke.c (g_function_info_invoke),
girepository/ginfo.c(g_registered_type_info_get_g_type): use
g_typelib_symbol instead of g_module_symbol.
* girepository/girepository.h: remove g_typelib_set_module and add
g_typelib_symbol.
* girepository/gtypelib.[ch] (find_some_symbol, _g_typelib_init,
g_typelib_new_from_memory, g_typelib_new_from_const_memory,
g_typelib_free, g_typelib_symbol): chnage GTypeLib to hold a list of
modules instead of just one. The symbol lookup is now abstracted
behind g_typelib_symbol which tries to find the passed symbol name in
one of its modules.
* giscanner/girwriter.py, tools/g-ir-scanner: change scanner to read
and write shared_library attribute as a comma-separated list of libs.
svn path=/trunk/; revision=660
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/g-ir-scanner | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner index 667a9acc..63f71c21 100755 --- a/tools/g-ir-scanner +++ b/tools/g-ir-scanner @@ -175,8 +175,8 @@ def main(args): _error("Unknown format: %s" % (options.format, )) if not options.libraries: - _error("Must specify --library for primary library") - primary_library = options.libraries[0] + _error("Must specify --library at least one primary library") + libraries = options.libraries for package in options.packages: output = subprocess.Popen(['pkg-config', '--cflags', package], @@ -236,7 +236,7 @@ def main(args): namespace = glibtransformer.parse() # Write out AST - writer = Writer(namespace, primary_library, transformer.get_includes()) + writer = Writer(namespace, libraries, transformer.get_includes()) data = writer.get_xml() if options.output: fd = open(options.output, "w") |