add FT_Int32 add XftFont Report errors when an invalid type is encountered

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.

svn path=/trunk/; revision=1050

diff --git a/ChangeLog b/ChangeLog
index 898f7a0..bd32e9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 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.
+
+2009-01-15  Johan Dahlin  <jdahlin@async.com.br>
+
        * gir/GL-1.0.gir:
        * gir/Makefile.am:
        * gir/cairo-1.0.gir:

diff --git a/gir/freetype2-2.0.gir b/gir/freetype2-2.0.gir
index 608b08a..d219442 100644 (file)
--- a/gir/freetype2-2.0.gir
+++ b/gir/freetype2-2.0.gir
@@ -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"/>

diff --git a/gir/xft-2.0.gir b/gir/xft-2.0.gir
index b89e66c..1d6bd58 100644 (file)
--- a/gir/xft-2.0.gir
+++ b/gir/xft-2.0.gir
@@ -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">

diff --git a/girepository/gdump.c b/girepository/gdump.c
index 23650be..519672a 100644 (file)
--- a/girepository/gdump.c
+++ b/girepository/gdump.c
@@ -362,7 +362,8 @@ g_irepository_dump (const char *arg, GError **error)
 
       if (type == G_TYPE_INVALID)
        {
-         caught_error = TRUE;
+          g_printerr ("Invalid GType: '%s'\n", line);
+          caught_error = TRUE;
          g_free (line);
          break;
        }

diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py
index d46c3c0..afd9c45 100644 (file)
--- a/giscanner/glibtransformer.py
+++ b/giscanner/glibtransformer.py
@@ -225,7 +225,10 @@ class GLibTransformer(object):
         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