Merge in the gir-compiler branch. Thanks to Philip and Colin for their

2008-08-08  Johan Dahlin  <johan@gnome.org>

    * girepository/gtypelib.c (validate_header):
    * girepository/gtypelib.h:
    * giscanner/ast.py:
    * giscanner/girwriter.py:
    * giscanner/sourcescanner.c (gi_source_symbol_ref),
    (gi_source_symbol_unref):
    * tests/array.test:
    * tests/boxed.test:
    * tests/constant.test:
    * tests/enum.test:
    * tests/errors.test:
    * tests/function.test:
    * tests/gobject.test:
    * tests/interface.test:
    * tests/invoke/Makefile.am:
    * tests/invoke/testfns.xml:
    * tests/object.test:
    * tests/parser/Makefile.am:
    * tests/roundtrips.sh:
    * tests/struct.test:
    * tests/types.test:
    * tests/union.test:
    * tests/xref1.test:
    * tests/xref2.test:
    * tools/Makefile.am:
    * tools/compiler.c (main):
    * tools/generate.c (write_callable_info), (write_function_info),
    (write_repository):
    * tools/gidlmodule.c:
    * tools/gidlmodule.h:
    * tools/gidlnode.c:
    * tools/gidlnode.h:
    * tools/gidlparser.c:
    * tools/gidlparser.h:
    * tools/gidlwriter.c:
    * tools/gidlwriter.h:
    * tools/scanner.c (create_node_from_gtype),
    (create_node_from_ctype), (g_igenerator_process_properties),
    (g_igenerator_process_signals), (g_igenerator_create_object),
    (g_igenerator_create_interface), (g_igenerator_create_boxed),
    (g_igenerator_create_enum), (g_igenerator_create_flags),
    (g_igenerator_process_function_symbol),
    (g_igenerator_process_unregistered_struct_typedef),
    (g_igenerator_process_struct_typedef),
    (g_igenerator_process_union_typedef),
    (g_igenerator_process_enum_typedef),
    (g_igenerator_process_function_typedef),
    (g_igenerator_process_constant), (g_igenerator_process_symbols),
    (g_igenerator_add_module), (g_igenerator_add_include_idl):
    Merge in the gir-compiler branch.
    Thanks to Philip and Colin for their help.


svn path=/trunk/; revision=325

3 files changed, 69 insertions, 67 deletions

diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am
index b56ca4dc..fa83d7be 100644
--- a/tests/invoke/Makefile.am
+++ b/tests/invoke/Makefile.am
@@ -16,11 +16,11 @@ testfns_la_LIBADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.
 BUILT_SOURCES = testfns-metadata.c test.repo
 CLEANFILES = testfns-metadata.c test.repo
 
-testfns-metadata.c: testfns.xml $(top_builddir)/tools/g-idl-compiler
-	$(top_builddir)/tools/g-idl-compiler $(srcdir)/testfns.xml -o testfns-metadata.c
+testfns-metadata.c: testfns.gir $(top_builddir)/tools/g-ir-compiler
+	$(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns.gir -o testfns-metadata.c
 
-test.repo: testfns.xml
-	$(top_builddir)/tools/g-idl-compiler --shared-library testfns.la $< --raw -o $@
+test.repo: testfns.gir
+	$(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler --shared-library testfns.la $< --raw -o $@
 
 invoke_SOURCES = invoke.c
 invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
@@ -28,6 +28,6 @@ invoke_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
 
 TESTS = invoke invoke-namespace-find.sh
 
-EXTRA_DIST = invoke-namespace-find.sh testfns.xml
+EXTRA_DIST = invoke-namespace-find.sh testfns.gir
 
 TESTS_ENVIRONMENT = GIREPOPATH="."
diff --git a/tests/invoke/testfns.gir b/tests/invoke/testfns.gir
new file mode 100755
index 00000000..4d6c520d
--- /dev/null
+++ b/tests/invoke/testfns.gir
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<repository version="1.0"
+            xmlns="http://www.gtk.org/introspection/core/1.0"
+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+  <namespace name="test">
+    <function name="test1" c:identifier="test1">
+      <return-type c:type="gint"/>
+      <parameters>
+        <parameter name="in" c:type="gint" direction="in"/>
+      </parameters>
+    </function>
+
+    <function name="test2" c:identifier="test2">
+      <return-type c:type="void"/>
+      <parameters>
+        <parameter name="in" c:type="gint" direction="in"/>
+        <parameter name="out" c:type="gint" direction="out"/>
+      </parameters>
+    </function>
+
+    <function name="test3" c:identifier="test3">
+      <return-type c:type="void"/>
+      <parameters>
+        <parameter name="inout" c:type="gint" direction="inout"/>
+      </parameters>
+    </function>
+
+    <function name="test4" c:identifier="test4">
+      <return-type c:type="void"/>
+      <parameters>
+        <parameter name="blurb" c:type="gchar*" direction="in"/>
+      </parameters>
+    </function>
+
+    <function name="test5" c:identifier="test5">
+      <return-type c:type="void"/>
+      <parameters>
+        <parameter name="blurb" c:type="gchar*" direction="out" transfer="full"/>
+        <parameter name="len" c:type="gint" direction="out"/>
+      </parameters>
+    </function>
+
+    <function name="test6" c:identifier="test6">
+      <return-type c:type="gint"/>
+      <parameters>
+        <parameter name="list" c:type="GList<gint>*" direction="in"/>
+      </parameters>
+    </function>
+
+
+    <function name="test7" c:identifier="test7">
+      <return-type c:type="utf8" transfer="full"/>
+      <parameters>
+        <parameter name="list" c:type="GList<utf8>*" direction="in"/>
+      </parameters>
+    </function>
+
+    <function name="broken" c:identifier="broken">
+      <return-type c:type="void"/>
+    </function>
+
+  </namespace>
+</repository>
diff --git a/tests/invoke/testfns.xml b/tests/invoke/testfns.xml
deleted file mode 100644
index 7997bfa8..00000000
--- a/tests/invoke/testfns.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-  <namespace name="test">
-
-    <function name="test1" symbol="test1">
-      <return-type type="gint"/>
-      <parameters>
-        <parameter name="in" type="gint" direction="in"/>
-      </parameters>
-    </function>
-
-    <function name="test2" symbol="test2">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="in" type="gint" direction="in"/>
-        <parameter name="out" type="gint" direction="out"/>
-      </parameters>
-    </function>
-
-    <function name="test3" symbol="test3">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="inout" type="gint" direction="inout"/>
-      </parameters>
-    </function>
-
-    <function name="test4" symbol="test4">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="blurb" type="gchar*" direction="in"/>
-      </parameters>
-    </function>
-
-    <function name="test5" symbol="test5">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="blurb" type="gchar*" direction="out" transfer="full"/>
-        <parameter name="len" type="gint" direction="out"/>
-      </parameters>
-    </function>
-
-    <function name="test6" symbol="test6">
-      <return-type type="gint"/>
-      <parameters>
-        <parameter name="list" type="GList<gint>*" direction="in"/>
-      </parameters>
-    </function>
-
-
-    <function name="test7" symbol="test7">
-      <return-type type="utf8" transfer="full"/>
-      <parameters>
-        <parameter name="list" type="GList<utf8>*" direction="in"/>
-      </parameters>
-    </function>
-
-    <function name="broken" symbol="broken">
-      <return-type type="void"/>
-    </function>
-
-  </namespace>
-</api>