ignore empty lines in .files

2007-11-22  Juerg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: ignore empty lines in .files

	* vapigen/vala-gen-introspect/vala-gen-introspect.in: add some type
	  aliases

svn path=/trunk/; revision=698

diff --git a/ChangeLog b/ChangeLog
index 09f56af..10d9999 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-11-22  Jürg Billeter  <j@bitron.ch>
 
+       * vapigen/valagidlparser.vala: ignore empty lines in .files
+
+       * vapigen/vala-gen-introspect/vala-gen-introspect.in: add some type
+         aliases
+
+2007-11-22  Jürg Billeter  <j@bitron.ch>
+
        * gobject-introspection/gen-introspect.c: don't process get_type
          function symbols twice, support Interface suffix in addition to the
          more common Iface suffix

diff --git a/vapigen/vala-gen-introspect/vala-gen-introspect.in b/vapigen/vala-gen-introspect/vala-gen-introspect.in
index 4ed0429..b1b14ea 100755 (executable)
--- a/vapigen/vala-gen-introspect/vala-gen-introspect.in
+++ b/vapigen/vala-gen-introspect/vala-gen-introspect.in
@@ -15,7 +15,7 @@ PKGNAME=$1
 PKGBASE=$2/$1
 PKGPREFIX=`pkg-config --variable=prefix $PKGNAME`
 
-PKGFILES=`cat $PKGBASE.files | sed -e "s@^@$PKGPREFIX/@"`
+PKGFILES=`cat $PKGBASE.files | grep ^[a-zA-Z] | sed -e "s@^@$PKGPREFIX/@"`
 
 if [ -e $PKGBASE.excludes ]
 then

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 2d21bf6..3ae8779 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -846,13 +846,15 @@ public class Vala.GIdlParser : CodeVisitor {
                                type.type_name = "short";
                        } else if (n == "gconstpointer" || n == "void") {
                                type.type_name = "pointer";
-                       } else if (n == "goffset") {
+                       } else if (n == "goffset" || n == "off_t") {
                                type.type_name = "int64";
                        } else if (n == "value_array") {
                                type.namespace_name = "GLib";
                                type.type_name = "ValueArray";
                        } else if (n == "time_t") {
                                type.type_name = "ulong";
+                       } else if (n == "socklen_t") {
+                               type.type_name = "uint32";
                        } else if (n == "mode_t") {
                                type.type_name = "uint";
                        } else if (n == "gint" || n == "pid_t") {
@@ -862,6 +864,8 @@ public class Vala.GIdlParser : CodeVisitor {
                        } else if (n == "FILE") {
                                type.namespace_name = "GLib";
                                type.type_name = "FileStream";
+                       } else if (n == "struct") {
+                               type.type_name = "pointer";
                        } else if (n == "GType") {
                                type.namespace_name = "GLib";
                                type.type_name = "Type";