Foo->foo, foo-object.h -> foo.h

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

svn path=/trunk/; revision=409

diff --git a/ChangeLog b/ChangeLog
index 42d3477..42fdeb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 
        * 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
+
+2008-08-20  Johan Dahlin  <johan@gnome.org>
+
+       * tests/scanner/Foo-expected.gir:
+       * tests/scanner/Makefile.am:
        * tests/scanner/drawable-expected.gir:
        * tests/scanner/drawable.c (test_drawable_class_init),
        (test_drawable_init):

diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 38930b3..78aa0ee 100644 (file)
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -9,7 +9,7 @@ libdrawable_la_CFLAGS = $(GOBJECT_CFLAGS)
 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_CFLAGS = $(GOBJECT_CFLAGS)
 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 @@ utility.gir: libutility.la utility.h $(SCANNER) $(SCANNER_LIBS)
        $(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 @@ pre-check:
        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 @@ check-local: pre-check check-utility.gir check-drawable.gir check-Foo.gir
           rm -f $(top_builddir)/giscanner/*.py*; \
        fi
 
-.PHONY: utility.gir drawable.gir Foo.gir
+.PHONY: utility.gir drawable.gir foo.gir

diff --git a/tests/scanner/Foo-expected.gir b/tests/scanner/foo-expected.gir
similarity index 99%
rename from tests/scanner/Foo-expected.gir
rename to tests/scanner/foo-expected.gir
index 3291b06..a91234e 100644 (file)
--- a/tests/scanner/Foo-expected.gir
+++ b/tests/scanner/foo-expected.gir
@@ -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"

diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c
index aa47cd6..f3336c5 100644 (file)
--- a/tests/scanner/foo.c
+++ b/tests/scanner/foo.c
@@ -1,6 +1,6 @@
 #define FOO_SUCCESS_INT 0x1138
 
-#include "foo-object.h"
+#include "foo.h"
 
 typedef struct
 {

diff --git a/tests/scanner/foo-object.h b/tests/scanner/foo.h
similarity index 100%
rename from tests/scanner/foo-object.h
rename to tests/scanner/foo.h