gir-repository r114 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Sun Oct 12 04:32:58 2008
New Revision: 114
URL: http://svn.gnome.org/viewvc/gir-repository?rev=114&view=rev

Log:
2008-10-12  Johan Dahlin  <johan gnome org>

    * gir/GdkPixbuf-assertions.txt:
    * gir/Gtk-assertions.txt:
    * gir/Gtk.xpath:
    * gir/Makefile.am:
    * gir/WebKit-assertions.txt:
    Rename *.txt to *.xpath. Generalize makefile test rules and only
    run the tests when invoking make check.
    Rename DestroyNotify to GLib.DestroyNotify.



Added:
   trunk/gir/GdkPixbuf.xpath   (props changed)
      - copied unchanged from r111, /trunk/gir/GdkPixbuf-assertions.txt
   trunk/gir/Gtk.xpath   (contents, props changed)
      - copied, changed from r111, /trunk/gir/Gtk-assertions.txt
   trunk/gir/WebKit.xpath   (props changed)
      - copied unchanged from r111, /trunk/gir/WebKit-assertions.txt
Removed:
   trunk/gir/GdkPixbuf-assertions.txt
   trunk/gir/Gtk-assertions.txt
   trunk/gir/WebKit-assertions.txt
Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Copied: trunk/gir/Gtk.xpath (from r111, /trunk/gir/Gtk-assertions.txt)
==============================================================================
--- /trunk/gir/Gtk-assertions.txt	(original)
+++ trunk/gir/Gtk.xpath	Sun Oct 12 04:32:58 2008
@@ -1,6 +1,6 @@
 /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='weakref']/parameters/parameter[ name='notify']/type[ name='DestroyNotify']
+/namespace/class[ name='Object']/method[ name='weakref']/parameters/parameter[ name='notify']/type[ name='GLib.DestroyNotify']
 /namespace/class[ name='TextView']/method[ name='get_buffer']/return-value/type[ name='TextBuffer']
 

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sun Oct 12 04:32:58 2008
@@ -1,10 +1,10 @@
-CLEANFILES = 
-EXTRA_DIST = 
+CLEANFILES =
+EXTRA_DIST =
 lib_LTLIBRARIES =
 COMMON_CUSTOM_LDFLAGS= -module -avoid-version -rdynamic
 
-CUSTOM_GIRSOURCES = 	\
-	cairo.gir 	\
+CUSTOM_GIRSOURCES =	\
+	cairo.gir	\
 	DBus.gir	\
 	fontconfig.gir	\
 	freetype2.gir	\
@@ -14,6 +14,8 @@
 	GL.gir
 BUILT_GIRSOURCES =
 
+XPATH_TESTS =
+
 if BUILD_MISSIONCONTROL
 CUSTOM_GIRSOURCES += DBusGLib.gir \
 	TelepathyGLib.gir \
@@ -23,7 +25,7 @@
 if BUILD_GCONF
 GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
 GCONF_LIBDIR=`pkg-config --variable=libdir gconf-2.0`
-GConf.gir: $(G_IR_SCANNER) 
+GConf.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GConf \
             --include=GObject.gir \
             --library=gconf-2 \
@@ -204,8 +206,8 @@
              --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
+XPATH_TESTS += GdkPixbuf.xpath
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
@@ -257,8 +259,8 @@
 	     -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
+XPATH_TESTS += Gtk.xpath
 endif
 
 # webkit
@@ -278,9 +280,9 @@
              --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
+XPATH_TESTS += WebKit.xpath
 endif BUILD_WEBKIT
 
 # libnotify
@@ -535,9 +537,15 @@
 
 CLEANFILES += $(typelibs_DATA) $(TXML)
 
+
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
+%.xpath: %.gir
+
+%.xpath.test: %.xpath
+	$(G_IR_SCANNER) --xpath-assertions=$*.xpath $*.gir
+
 %.typelib: %.gir 
 	$(DEBUG) $(G_IR_COMPILER) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
@@ -546,11 +554,9 @@
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA:.typelib=.typelib.xml) $(typelibs_DATA:.typelib=.typelib.xml.typelib)
 
+check-local: $(XPATH_TESTS:.xpath=.xpath.test)
+
 check-local: $(typelibs_DATA)
-	@for x in $(typelibs_DATA); do \
-         echo 1>&2 $$x; \
-	 echo 1>&2 $(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
+	for x in $(typelibs_DATA); do \
 	 $(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
-	 #echo 1>&2 $(DEBUG) $(G_IR_COMPILER) --includedir=. $${x}.xml -o $${x}.xml.typelib; \
-	 #$(DEBUG) $(G_IR_COMPILER) --includedir=. $${x}.xml -o $${x}.xml.typelib; \
 	done