gir-repository r91 - trunk/gir

[walters svn gnome org]

Author: walters
Date: Fri Sep 12 22:46:22 2008
New Revision: 91
URL: http://svn.gnome.org/viewvc/gir-repository?rev=91&view=rev

Log:
Move assertions into text files, using new g-ir-scanner --xpath-assertions

	* gir/*.txt: New assertions files.
	* gir/tests.py: Delete, now in g-ir-scanner.
	* gir/Makefile.am: Use them.


Added:
   trunk/gir/GdkPixbuf-assertions.txt
   trunk/gir/Gtk-assertions.txt
   trunk/gir/WebKit-assertions.txt
Removed:
   trunk/gir/tests.py
Modified:
   trunk/gir/Makefile.am

Added: trunk/gir/GdkPixbuf-assertions.txt
==============================================================================
--- (empty file)
+++ trunk/gir/GdkPixbuf-assertions.txt	Fri Sep 12 22:46:22 2008
@@ -0,0 +1,5 @@
+/namespace/class[ name='Pixbuf']
+/namespace/enumeration[ name='Error']/member[ name='failed']
+/namespace/class[ name='Animation']/method[ name='get_width']/return-value/type[ name='int']
+/namespace/class[ name='Animation']/method[ name='get_static_image']/return-value/type[ name='Pixbuf']
+/namespace/class[ name='Animation']/method[ name='get_iter']/parameters/parameter[ name='start_time']/type[ name='GLib.TimeVal']

Added: trunk/gir/Gtk-assertions.txt
==============================================================================
--- (empty file)
+++ trunk/gir/Gtk-assertions.txt	Fri Sep 12 22:46:22 2008
@@ -0,0 +1,5 @@
+/namespace/class[ name='Window']
+/namespace/enumeration[ name='TreeViewDropPosition']/member[ name='into-or-before']
+/namespace/bitfield[ name='AttachOptions']/member[ name='expand']
+/namespace/class[ name='Object']/method[ name='sink']/parameters/parameter/type[ name='Object']
+

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Sep 12 22:46:22 2008
@@ -181,6 +181,7 @@
              --pkg gio-2.0 \
              -I$(GDKPIXBUF_INCLUDEDIR) \
              $(GDKPIXBUF_INCLUDEDIR)/gdk-pixbuf/*.h
+	$(G_IR_SCANNER) --xpath-assertions=GdkPixbuf-assertions.txt GdkPixbuf.gir
 BUILT_GIRSOURCES += GdkPixbuf.gir
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
@@ -233,6 +234,7 @@
 	     -I$(GTK_INCLUDEDIR) \
 	     $(srcdir)/gtk-x11-2.0.c \
              $(GTK_INCLUDEDIR)/gtk/*.h
+	$(G_IR_SCANNER) --xpath-assertions=Gtk-assertions.txt Gtk.gir
 BUILT_GIRSOURCES += Gtk.gir
 endif
 
@@ -253,6 +255,7 @@
              --output $@ \
 	     -I$(WEBKIT_INCLUDEDIR) \
              $(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
+	$(G_IR_SCANNER) --xpath-assertions=WebKit-assertions.txt WebKit.gir
 BUILT_GIRSOURCES += WebKit.gir
 CUSTOM_GIRSOURCES += JSCore.gir
 endif BUILD_WEBKIT
@@ -474,10 +477,6 @@
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA:.typelib=.typelib.xml) $(typelibs_DATA:.typelib=.typelib.xml.typelib)
 
-TESTS = tests.py
-
-EXTRA_DIST += $(TESTS)
-
 check-local: $(typelibs_DATA)
 	@for x in $(typelibs_DATA); do \
          echo 1>&2 $$x; \

Added: trunk/gir/WebKit-assertions.txt
==============================================================================
--- (empty file)
+++ trunk/gir/WebKit-assertions.txt	Fri Sep 12 22:46:22 2008
@@ -0,0 +1,5 @@
+/namespace/class[ name='WebFrame']
+/namespace/class[ name='WebView']/constructor[ name='new']/return-value/type[ name='Gtk.Widget']
+/namespace/class[ name='WebView']/method[ name='can_go_back']
+/namespace/class[ name='WebView']/property[ name='copy-target-list']/type[ name='Gtk.TargetList']
+/namespace/class[ name='WebView']/callback[ name='window_object_cleared']/parameters/parameter[ name='context']/type[ name='JSCore.GlobalContextRef']