gobject-introspection r409 - in trunk: . tests/scanner

[johan svn gnome org]

Author: johan
Date: Wed Aug 20 12:24:44 2008
New Revision: 409
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=409&view=rev

Log:
2008-08-20  Johan Dahlin  <johan gnome org>

    * tests/scanner/Foo-expected.gir:
    * tests/scanner/Makefile.am:
    * tests/scanner/foo-expected.gir:
    * tests/scanner/foo-object.h:
    * tests/scanner/foo.c:
    Foo->foo, foo-object.h -> foo.h



Added:
   trunk/tests/scanner/foo-expected.gir
      - copied, changed from r408, /trunk/tests/scanner/Foo-expected.gir
   trunk/tests/scanner/foo.h
      - copied unchanged from r408, /trunk/tests/scanner/foo-object.h
Removed:
   trunk/tests/scanner/Foo-expected.gir
   trunk/tests/scanner/foo-object.h
Modified:
   trunk/ChangeLog
   trunk/tests/scanner/   (props changed)
   trunk/tests/scanner/Makefile.am
   trunk/tests/scanner/foo.c

Modified: trunk/tests/scanner/Makefile.am
==============================================================================
--- trunk/tests/scanner/Makefile.am	(original)
+++ trunk/tests/scanner/Makefile.am	Wed Aug 20 12:24:44 2008
@@ -9,7 +9,7 @@
 libdrawable_la_LDFLAGS = -module -avoid-version
 libdrawable_la_LIBADD = $(GOBJECT_LIBS)
 
-libfoo_la_SOURCES = $(srcdir)/foo.c $(srcdir)/foo-object.h
+libfoo_la_SOURCES = $(srcdir)/foo.c $(srcdir)/foo.h
 libfoo_la_CFLAGS = $(GOBJECT_CFLAGS)
 libfoo_la_LDFLAGS = -module -avoid-version
 libfoo_la_LIBADD = $(GOBJECT_LIBS)
@@ -19,8 +19,8 @@
 libutility_la_LDFLAGS = -module -avoid-version
 libutility_la_LIBADD = $(GOBJECT_LIBS)
 
-CLEANFILES = utility.gir Foo.gir
-EXTRA_DIST = utility-expected.gir Foo-expected.gir
+CLEANFILES = utility.gir foo.gir
+EXTRA_DIST = utility-expected.gir foo-expected.gir
 
 SCANNER = $(top_srcdir)/tools/g-ir-scanner
 SCANNER_LIBS = \
@@ -37,13 +37,13 @@
 	$(libutility_la_SOURCES) \
 	--output $@
 
-Foo.gir: libfoo.la foo-object.h $(SCANNER) $(SCANNER_LIBS)
+foo.gir: libfoo.la foo.h $(SCANNER) $(SCANNER_LIBS)
 	$(CHECK_DEBUG) $(SCANNER) -v \
 	--include=$(top_srcdir)/gir/glib-2.0.gir \
 	--include=$(top_srcdir)/gir/gobject-2.0.gir \
 	--include=$(top_builddir)/tests/scanner/utility.gir \
 	--library=libfoo.la \
-	--namespace=Foo \
+	--namespace=foo \
 	--pkg gobject-2.0 \
 	$(libfoo_la_SOURCES) \
 	 --output $@
@@ -67,7 +67,7 @@
 	fi
 	@echo "Running scanner checks..."
 
-check-local: pre-check check-utility.gir check-drawable.gir check-Foo.gir
+check-local: pre-check check-utility.gir check-drawable.gir check-foo.gir
 	@echo "======================="
 	@echo "All parser tests passed"
 	@echo "======================="
@@ -75,4 +75,4 @@
 	   rm -f $(top_builddir)/giscanner/*.py*; \
 	fi
 
-.PHONY: utility.gir drawable.gir Foo.gir
+.PHONY: utility.gir drawable.gir foo.gir

Copied: trunk/tests/scanner/foo-expected.gir (from r408, /trunk/tests/scanner/Foo-expected.gir)
==============================================================================
--- /trunk/tests/scanner/Foo-expected.gir	(original)
+++ trunk/tests/scanner/foo-expected.gir	Wed Aug 20 12:24:44 2008
@@ -2,7 +2,7 @@
             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="Foo">
+  <namespace name="foo">
     <alias name="List" target="GSList" c:type="FooList"/>
     <alias name="XEvent" target="none" c:type="FooXEvent"/>
     <interface name="Interface"

Modified: trunk/tests/scanner/foo.c
==============================================================================
--- trunk/tests/scanner/foo.c	(original)
+++ trunk/tests/scanner/foo.c	Wed Aug 20 12:24:44 2008
@@ -1,6 +1,6 @@
 #define FOO_SUCCESS_INT 0x1138
 
-#include "foo-object.h"
+#include "foo.h"
 
 typedef struct
 {