gobject-introspection r1050 - in trunk: . gir girepository giscanner

[johan svn gnome org]

Author: johan
Date: Fri Jan 16 00:42:22 2009
New Revision: 1050
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=1050&view=rev

Log:
2009-01-15  Johan Dahlin  <jdahlin async com br>

	* gir/freetype2-2.0.gir: add FT_Int32
	* gir/xft-2.0.gir: add XftFont
	* girepository/gdump.c (g_irepository_dump):
	Report errors when an invalid type is encountered
	* giscanner/glibtransformer.py:
	Make the error message a bit nicer.

	Part of preparating for gir generating inside pango.



Modified:
   trunk/ChangeLog
   trunk/gir/freetype2-2.0.gir
   trunk/gir/xft-2.0.gir
   trunk/girepository/gdump.c
   trunk/giscanner/glibtransformer.py

Modified: trunk/gir/freetype2-2.0.gir
==============================================================================
--- trunk/gir/freetype2-2.0.gir	(original)
+++ trunk/gir/freetype2-2.0.gir	Fri Jan 16 00:42:22 2009
@@ -5,6 +5,7 @@
   <namespace name="freetype2" version="2.0" shared-library="freetype">
     <record name="Bitmap" c:type="FT_Bitmap"/>
     <record name="Face" c:type="FT_Face"/>
+    <alias name="Int32" target="int32" c:type="FT_Int32"/>
     <function name="library_version" c:identifier="FT_Library_Version">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>

Modified: trunk/gir/xft-2.0.gir
==============================================================================
--- trunk/gir/xft-2.0.gir	(original)
+++ trunk/gir/xft-2.0.gir	Fri Jan 16 00:42:22 2009
@@ -5,6 +5,7 @@
   <namespace name="xft" version="2.0" shared-library="Xft">
     <record name="Color" c:type="XftColor"/>
     <record name="Draw" c:type="XftDraw"/>
+    <record name="Font" c:type="XftFont"/>
 
     <function name="init" c:identifier="XftInit">
       <return-value transfer-ownership="none">

Modified: trunk/girepository/gdump.c
==============================================================================
--- trunk/girepository/gdump.c	(original)
+++ trunk/girepository/gdump.c	Fri Jan 16 00:42:22 2009
@@ -362,7 +362,8 @@
 
       if (type == G_TYPE_INVALID)
 	{
-	  caught_error = TRUE;
+          g_printerr ("Invalid GType: '%s'\n", line);
+          caught_error = TRUE;
 	  g_free (line);
 	  break;
 	}

Modified: trunk/giscanner/glibtransformer.py
==============================================================================
--- trunk/giscanner/glibtransformer.py	(original)
+++ trunk/giscanner/glibtransformer.py	Fri Jan 16 00:42:22 2009
@@ -225,7 +225,10 @@
         args.append('--introspect-dump=%s,%s' % (in_path, out_path))
 
         # Invoke the binary, having written our get_type functions to types.txt
-        subprocess.check_call(args, stdout=sys.stdout, stderr=sys.stderr)
+        try:
+            subprocess.check_call(args, stdout=sys.stdout, stderr=sys.stderr)
+        except subprocess.CalledProcessError, e:
+            raise SystemExit(e)
         self._read_introspect_dump(out_path)
 
         # Clean up temporaries