gobject-introspection r241 - in trunk: . gidl gir tests/parser

[johan svn gnome org]

Author: johan
Date: Mon Apr 28 02:22:07 2008
New Revision: 241
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=241&view=rev

Log:
2008-04-27  Johan Dahlin  <johan gnome org>

        * Makefile.am:
        * configure.ac:
        * gidl/Makefile.am:
        * gidl/gobject-2.0.gidl:
        * gir/Makefile.am:
        * gir/gobject-2.0.gir:
        * tests/parser/Makefile.am:
        Replace the GObject gidl with a GObject gir.



Added:
   trunk/gir/   (props changed)
   trunk/gir/Makefile.am
   trunk/gir/gobject-2.0.gir
Removed:
   trunk/gidl/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/tests/parser/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Apr 28 02:22:07 2008
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gidl girepository giscanner tools tests
+SUBDIRS = gir girepository giscanner tools tests
 DIST_SUBDIRS = m4 $(SUBDIRS)
 
 pkgconfigdir = $(libdir)/pkgconfig

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Apr 28 02:22:07 2008
@@ -98,7 +98,7 @@
 AM_CHECK_PYTHON_HEADERS
 
 AC_CONFIG_FILES([Makefile
-                 gidl/Makefile
+                 gir/Makefile
                  girepository/Makefile
                  giscanner/Makefile
                  m4/Makefile

Added: trunk/gir/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/gir/Makefile.am	Mon Apr 28 02:22:07 2008
@@ -0,0 +1,2 @@
+girdir = $(datadir)/gir
+dist_gir_DATA = gobject-2.0.gir

Added: trunk/gir/gobject-2.0.gir
==============================================================================
--- (empty file)
+++ trunk/gir/gobject-2.0.gir	Mon Apr 28 02:22:07 2008
@@ -0,0 +1,15 @@
+<repository version="1.0"
+            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="GLib">
+    <class name="Object"
+           glib:type-name="GObject"
+           glib:get-type="intern">
+    </class>
+    <class name="InitiallyUnowned"
+           glib:type-name="GInitiallyUnowned"
+           glib:get-type="g_initially_unowned_get_type">
+    </class>
+  </namespace>
+</repository>

Modified: trunk/tests/parser/Makefile.am
==============================================================================
--- trunk/tests/parser/Makefile.am	(original)
+++ trunk/tests/parser/Makefile.am	Mon Apr 28 02:22:07 2008
@@ -16,9 +16,10 @@
 EXTRA_DIST = utility-expected.gir Foo-expected.gir 
 
 SCANNER = $(top_builddir)/tools/g-ir-scanner
+
 utility.gir: libutility.la utility.h $(SCANNER)
 	@PYTHONPATH=$(top_srcdir) $(SCANNER) -v \
-	--include=$(top_srcdir)/gidl/gobject-2.0.gidl \
+	--include=$(top_srcdir)/gir/gobject-2.0.gir \
 	--library=libutility.la \
 	--namespace=utility \
 	--pkg gobject-2.0 \
@@ -26,10 +27,10 @@
 
 Foo.gir: libfoo.la foo-object.h $(SCANNER)
 	@PYTHONPATH=$(top_srcdir) $(SCANNER) -v \
-	--include=$(top_srcdir)/gidl/gobject-2.0.gidl \
+	--include=$(top_srcdir)/gir/gobject-2.0.gir \
 	--include=$(srcdir)/utility.gir \
-	--namespace=Foo \
 	--library=libfoo.la \
+	--namespace=Foo \
 	--pkg gobject-2.0 \
 	$(libfoo_la_SOURCES) \
 	 --output $@