Merge branch 'master' of ssh://walters@git.gnome.org/git/gobject-introspection

9 files changed, 132 insertions, 12 deletions

diff --git a/docs/reference/gi-docs.sgml b/docs/reference/gi-docs.sgml
index dc28eba..864a0f0 100644
--- a/docs/reference/gi-docs.sgml
+++ b/docs/reference/gi-docs.sgml
@@ -63,4 +63,6 @@ Bla bla bla bla bla
     &g-ir-generator;
   </chapter>
 -->
+
+   <xi:include href="xml/annotation-glossary.xml" />
 </book>
diff --git a/docs/reference/gi-gir-reference.xml b/docs/reference/gi-gir-reference.xml
new file mode 100644
index 0000000..8d19112
--- /dev/null
+++ b/docs/reference/gi-gir-reference.xml
@@ -0,0 +1,114 @@
+<chapter id="gi-gir-reference">
+
+  <title>The GIR XML format</title>
+
+  <para>
+    This chapter describes the GIR XML markup format.
+  </para>
+
+   <refsect2 id="gi-gir-api">
+     <title><emphasis>api</emphasis> node</title>
+
+     The root node of all GIR documents is the api node.
+
+     Possible children: <link linkend="gi-gir-namespace">namespace</link>.
+
+     <example>
+     <title>A GIR fragment showing an api node</title>
+     <programlisting><![CDATA[
+     <api version="1.0">
+       <namespace/>
+     </api>]]></programlisting>
+     </example>
+
+   </refsect2>
+
+   <refsect2 id="gi-gir-namespace">
+     <title><emphasis>namespace</emphasis> node</title>
+
+     Parent node: <link linkend="gi-gir-api">api</link>.
+     Possible children: <link linkend="gi-gir-callback">callback</link>,
+     <link linkend="gi-gir-class">class</link>,
+     <link linkend="gi-gir-function">function</link>.
+     <link linkend="gi-gir-interface">interface</link>.
+
+     <example>
+     <title>A GIR fragment showing an namespace node</title>
+     <programlisting><![CDATA[
+     <api version="1.0">
+       <namespace="Gtk">
+          <class/>
+          <function/>
+       </namespace>
+     </api>]]></programlisting>
+     </example>
+
+   </refsect2>
+
+   <refsect2 id="gi-gir-class">
+     <title><emphasis>class</emphasis> node</title>
+
+     Parent node: <link linkend="gi-gir-namespace">namespace</link>.
+     Possible children: <link linkend="gi-gir-class">constructor</link>,
+     <link linkend="gi-gir-field">field</link>,
+     <link linkend="gi-gir-method">method</link>,
+     <link linkend="gi-gir-property">property</link>.
+     <example>
+     <title>A GIR fragment showing an class node</title>
+     <programlisting><![CDATA[
+     <api version="1.0">
+       <namespace="Gtk">
+         <class name="Widget">
+            <constructor/>
+            <field/>
+            <method/>
+            <property/>
+         <class>
+       </namespace>
+     </api>]]></programlisting>
+     </example>
+
+   </refsect2>
+
+   <refsect2 id="gi-gir-interface">
+     <title><emphasis>interface</emphasis> node</title>
+
+     Parent node: <link linkend="gi-gir-namespace">namespace</link>.
+     Possible children: <link linkend="gi-gir-field">field</link>,
+     <link linkend="gi-gir-method">method</link>,
+     <link linkend="gi-gir-property">property</link>.
+     <example>
+     <title>A GIR fragment showing an interface node</title>
+     <programlisting><![CDATA[
+     <api version="1.0">
+       <namespace="Gtk">
+         <interface name="Buildable">
+            <field/>
+            <method/>
+            <property/>
+         <interface>
+       </namespace>
+     </api>]]></programlisting>
+     </example>
+
+   </refsect2>
+
+   <refsect2 id="gi-gir-function">
+     <title><emphasis>function</emphasis> node</title>
+
+     Parent node: <link linkend="gi-gir-namespace">namespace</link>.
+     <example>
+     <title>A GIR fragment showing an function node</title>
+     <programlisting><![CDATA[
+     <api version="1.0">
+       <namespace="Gtk">
+         <function name="init">
+         </function>
+       </namespace>
+     </api>]]></programlisting>
+     </example>
+
+   </refsect2>
+
+</chapter>
+
diff --git a/gir/GL-1.0.gir b/gir/GL-1.0.gir
index e525ecd..1c27f9e 100644
--- a/gir/GL-1.0.gir
+++ b/gir/GL-1.0.gir
@@ -5,11 +5,14 @@
   <namespace name="GL" version="1.0">
     <record name="bitfield" c:type="GLbitfield"/>
     <record name="charARB" c:type="GLcharARB"/>
+    <record name="boolean" c:type="GLboolean"/>
     <record name="enum" c:type="GLenum"/>
     <record name="float" c:type="GLfloat"/>
     <record name="handleARB" c:type="GLhandleARB"/>
     <record name="int" c:type="GLint"/>
+    <record name="intptr" c:type="GLintptr"/>
     <record name="sizei" c:type="GLsizei"/>
+    <record name="sizeiptr" c:type="GLsizeiptr"/>
     <record name="uint" c:type="GLuint"/>
     <record name="void" c:type="GLvoid"/>
 
diff --git a/gir/Makefile.am b/gir/Makefile.am
index f74de6d..9b1b7c6 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -168,7 +168,7 @@ girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(GIRSOURCES)
 
 %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT)
-	$(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
 typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(GIRSOURCES:.gir=.typelib) $(GIRSOURCES:.gir=.typelib)
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index d7cfb04..1d1974f 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -574,6 +574,7 @@
 
 /**
  * g_volume_mount:
+ * @mount_operation: (allow-none):
  * @cancellable: (allow-none):
  */
 
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index e5ecc64..003ff2c 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -39,10 +39,10 @@ from .glibast import GLibBoxed
 _COMMENT_HEADER = '*\n '
 
 # Tags - annotations applyed to comment blocks
-TAG_SINCE = 'Since'
-TAG_DEPRECATED = 'Deprecated'
-TAG_RETURNS = 'Returns'
-TAG_RETURNS_ALT = 'Return value'
+TAG_SINCE = 'since'
+TAG_DEPRECATED = 'deprecated'
+TAG_RETURNS = 'returns'
+TAG_RETURNS_ALT = 'return value'
 
 # Options - annotations for parameters and return values
 OPT_ALLOW_NONE = 'allow-none'
@@ -179,7 +179,7 @@ class AnnotationParser(object):
                 comment_lines.append(line)
                 continue
             tag = self._parse_tag(line)
-            block.tags[tag.name] = tag
+            block.tags[tag.name.lower()] = tag
         block.comment = '\n'.join(comment_lines)
         self._blocks[block.name] = block
 
diff --git a/tests/everything/Makefile.am b/tests/everything/Makefile.am
index 72daa7d..adda322 100644
--- a/tests/everything/Makefile.am
+++ b/tests/everything/Makefile.am
@@ -42,7 +42,7 @@ Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.
 GIRS += Everything-$(TYPELIB_VERSION).gir
 
 %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile
-	$(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@
 
 %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile
-	 $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@
diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am
index 54c28ff..2902d51 100644
--- a/tests/invoke/Makefile.am
+++ b/tests/invoke/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES = testfns-metadata.c
 CLEANFILES = testfns-metadata.c 
 
 testfns-metadata.c: testfns-1.0.gir $(top_builddir)/tools/g-ir-compiler Makefile
-	$(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns-1.0.gir --code -o testfns-metadata.c
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns-1.0.gir --code -o testfns-metadata.c
 
 invoke_SOURCES = invoke.c
 invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index dd35329..d8c96fa 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -109,7 +109,7 @@ barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
 barapp_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la
 barapp_LDFLAGS = -export-dynamic
 BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
-	$(SCANNER) \
+LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(SCANNER) \
 	--include=GObject-2.0 \
         --libtool="$(LIBTOOL)" \
 	--program=./barapp \
@@ -143,10 +143,10 @@ post-check:
 	@true
 
 %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile
-	$(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@
 
 %.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile
-	 $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@
 
 %.tgir.check: %.tgir
 	@diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \