diff options
author | Colin Walters <walters@verbum.org> | 2008-08-20 23:56:40 +0000 |
---|---|---|
committer | Colin Walters <walters@src.gnome.org> | 2008-08-20 23:56:40 +0000 |
commit | 22c09a76dce4a349436d1fb9ac06d3f55c8fbd31 (patch) | |
tree | 31853962aa1d3be62706c4a145331568b5f26fed /tools | |
parent | 45d265d6bfe5e4b4b9b4006f1def57fc8d6c39a9 (diff) | |
download | gobject-introspection-22c09a76dce4a349436d1fb9ac06d3f55c8fbd31.tar.gz |
Remove g_irepository_register_file in favor of g_irepository_require.
2008-08-20 Colin Walters <walters@verbum.org>
* girepository/girepository.c: Remove
g_irepository_register_file in favor of
g_irepository_require. There are two
possible deployment scenarios for typelibs:
First, separate in $DATADIR/gitypelibs/. Second,
they may be embedded in shlibs. However since
the first is now the normal case, the API is
optimized around it.
Refactor internals to look up typelibs for
namespaces just-in-time, but we expect
consumers to call g_irepository_require.
Also, add some docs. No one has died from that
before.
* gir/Makefile.am: Need --library for glib.
* giscanner/girwriter.py: Write out shared-library.
* tools/g-ir-writer: Take the first --library
argument as the target of shared-library. In
the future we should make this nicer with pkg-config
probably.
svn path=/trunk/; revision=426
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/g-ir-scanner | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner index 31c7129b..d909658b 100755 --- a/tools/g-ir-scanner +++ b/tools/g-ir-scanner @@ -109,6 +109,10 @@ def main(args): else: _error("Unknown format: %s" % (options.format, )) + if not options.libraries: + _error("Must specify --library for primary library") + primary_library = options.libraries[0] + for package in options.packages: output = commands.getoutput('pkg-config --cflags %s' % (package, )) pkg_options, unused = parser.parse_args(output.split()) @@ -149,7 +153,7 @@ def main(args): namespace = glibtransformer.parse() # Write out AST - writer = Writer(namespace) + writer = Writer(namespace, primary_library) data = writer.get_xml() if options.output: fd = open(options.output, "w") |