gir-repository r116 - in trunk: . gir
- From: walters svn gnome org
- To: svn-commits-list gnome org
- Subject: gir-repository r116 - in trunk: . gir
- Date: Sun, 12 Oct 2008 04:53:58 +0000 (UTC)
Author: walters
Date: Sun Oct 12 04:53:58 2008
New Revision: 116
URL: http://svn.gnome.org/viewvc/gir-repository?rev=116&view=rev
Log:
Merge branch 'bug552858-versioning'
Conflicts:
gir/Makefile.am
Added:
trunk/gir/DBus-1.0.gir
- copied, changed from r115, /trunk/gir/DBus.gir
trunk/gir/DBusGLib-1.0.gir
- copied, changed from r115, /trunk/gir/DBusGLib.gir
trunk/gir/GL-1.0.gir
- copied, changed from r115, /trunk/gir/GL.gir
trunk/gir/JSCore-1.0.gir
- copied, changed from r115, /trunk/gir/JSCore.gir
trunk/gir/cairo-1.0.gir
- copied, changed from r115, /trunk/gir/cairo.gir
trunk/gir/fontconfig-2.0.gir
- copied, changed from r115, /trunk/gir/fontconfig.gir
trunk/gir/freetype2-2.0.gir
- copied, changed from r115, /trunk/gir/freetype2.gir
trunk/gir/libxml2-2.0.gir
- copied, changed from r115, /trunk/gir/libxml2.gir
trunk/gir/xft-2.0.gir
- copied, changed from r115, /trunk/gir/xft.gir
trunk/gir/xlib-2.0.gir
- copied, changed from r115, /trunk/gir/xlib.gir
Removed:
trunk/gir/DBus.gir
trunk/gir/DBusGLib.gir
trunk/gir/GL.gir
trunk/gir/GdkPixbuf.xpath
trunk/gir/Gtk.xpath
trunk/gir/JSCore.gir
trunk/gir/WebKit.xpath
trunk/gir/cairo.gir
trunk/gir/fontconfig.gir
trunk/gir/freetype2.gir
trunk/gir/libxml2.gir
trunk/gir/xft.gir
trunk/gir/xlib.gir
Modified:
trunk/ChangeLog
trunk/gir/Makefile.am
Copied: trunk/gir/DBus-1.0.gir (from r115, /trunk/gir/DBus.gir)
==============================================================================
--- /trunk/gir/DBus.gir (original)
+++ trunk/gir/DBus-1.0.gir Sun Oct 12 04:53:58 2008
@@ -3,7 +3,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="DBus" shared-library="dbus-glib-1">
+ <namespace name="DBus" version="1.0" shared-library="dbus-glib-1">
<alias name="int32_t" target="gint32" c:type="dbus_int32_t"/>
<alias name="bool" target="gboolean" c:type="dbus_bool_t"/>
Copied: trunk/gir/DBusGLib-1.0.gir (from r115, /trunk/gir/DBusGLib.gir)
==============================================================================
--- /trunk/gir/DBusGLib.gir (original)
+++ trunk/gir/DBusGLib-1.0.gir Sun Oct 12 04:53:58 2008
@@ -4,7 +4,7 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<include name="GObject"/>
- <namespace name="DBusGLib" shared-library="dbus-glib-1">
+ <namespace name="DBusGLib" version="1.0" shared-library="dbus-glib-1">
<record name="Connection" c:type="DBusGConnection"/>
<record name="MethodInvocation" c:type="DBusGMethodInvocation"/>
<class name="Proxy" c:type="DBusGProxy" parent="GObject.Object"
Copied: trunk/gir/GL-1.0.gir (from r115, /trunk/gir/GL.gir)
==============================================================================
--- /trunk/gir/GL.gir (original)
+++ trunk/gir/GL-1.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="GL" shared-library="GL">
+ <namespace name="GL" version="1.0" shared-library="GL">
<record name="bitfield" c:type="GLbitfield"/>
<record name="charARB" c:type="GLcharARB"/>
<record name="enum" c:type="GLenum"/>
Copied: trunk/gir/JSCore-1.0.gir (from r115, /trunk/gir/JSCore.gir)
==============================================================================
--- /trunk/gir/JSCore.gir (original)
+++ trunk/gir/JSCore-1.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="JSCore" shared-library="webkit-1.0">
+ <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
<alias name="GlobalContextRef"
target="none"
c:type="JSGlobalContextRef"/>
Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am (original)
+++ trunk/gir/Makefile.am Sun Oct 12 04:53:58 2008
@@ -3,15 +3,15 @@
lib_LTLIBRARIES =
COMMON_CUSTOM_LDFLAGS= -module -avoid-version -rdynamic
-CUSTOM_GIRSOURCES = \
- cairo.gir \
- DBus.gir \
- fontconfig.gir \
- freetype2.gir \
- libxml2.gir \
- xft.gir \
- xlib.gir \
- GL.gir
+CUSTOM_GIRSOURCES = \
+ cairo-1.0.gir \
+ DBus-1.0.gir \
+ fontconfig-2.0.gir \
+ freetype2-2.0.gir \
+ libxml2-2.0.gir \
+ xft-2.0.gir \
+ xlib-2.0.gir \
+ GL-1.0.gir
BUILT_GIRSOURCES =
XPATH_TESTS =
@@ -25,46 +25,47 @@
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)
- $(G_IR_SCANNER) -v --namespace GConf \
- --include=GObject.gir \
+
+GConf-2.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace GConf --nsversion=2.0 \
+ --include=GObject-2.0.gir \
--library=gconf-2 \
$(NOCLOSURE) \
--output $@ \
--pkg gconf-2.0 \
-I$(GCONF_INCLUDEDIR) \
$(GCONF_INCLUDEDIR)/gconf/*.h
-BUILT_GIRSOURCES += GConf.gir
+BUILT_GIRSOURCES += GConf-2.0.gir
endif
if BUILD_SOUP
SOUP_INCLUDEDIR=`pkg-config --variable=includedir libsoup-2.4`/libsoup-2.4
SOUP_LIBDIR=`pkg-config --variable=libdir libsoup-2.4`
-Soup.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Soup \
- --include=Gio.gir \
+Soup-2.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Soup --nsversion=2.0 \
+ --include=Gio-2.0.gir \
--library=soup-2.4 \
$(NOCLOSURE) \
--output $@ \
--pkg libsoup-2.4 \
-I$(SOUP_INCLUDEDIR) \
$(SOUP_INCLUDEDIR)/libsoup/*.h
-BUILT_GIRSOURCES += Soup.gir
+BUILT_GIRSOURCES += Soup-2.0.gir
endif
if BUILD_GNOMEKEYRING
GNOMEKEYRING_INCLUDEDIR=`pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1
GNOMEKEYRING_LIBDIR=`pkg-config --variable=libdir gnome-keyring-1`
-GnomeKeyring.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace GnomeKeyring \
- --include=GObject.gir \
+GnomeKeyring-2.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace GnomeKeyring --nsversion=2.0 \
+ --include=GObject-2.0.gir \
--library=gnome-keyring \
$(NOCLOSURE) \
--output $@ \
--pkg gnome-keyring-1 \
-I$(GNOMEKEYRING_INCLUDEDIR) \
$(GNOMEKEYRING_INCLUDEDIR)/*.h
-BUILT_GIRSOURCES += GnomeKeyring.gir
+BUILT_GIRSOURCES += GnomeKeyring-2.0.gir
endif
# pango
@@ -72,10 +73,10 @@
if BUILD_PANGO
PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
PANGO_LIBDIR=`pkg-config --variable=libdir pango`
-Pango.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Pango \
- --include=GObject.gir \
- --include=cairo.gir \
+Pango-1.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
+ --include=GObject-2.0.gir \
+ --include=$(srcdir)/cairo-1.0.gir \
--library=pango-1.0 \
$(NOCLOSURE) \
--output $@ \
@@ -85,15 +86,15 @@
--pkg freetype2 \
-I$(PANGO_INCLUDEDIR) \
$(PANGO_INCLUDEDIR)/pango/pango-*.h
-BUILT_GIRSOURCES += Pango.gir
+BUILT_GIRSOURCES += Pango-1.0.gir
PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace PangoFT2 \
- --include=GObject.gir \
- --include=Pango.gir \
- --include=$(srcdir)/freetype2.gir \
- --include=$(srcdir)/fontconfig.gir \
+PangoFT2-1.0.gir: fontconfig-2.0.gir freetype2-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
+ --include=GObject-2.0.gir \
+ --include=./Pango-1.0.gir \
+ --include=$(srcdir)/freetype2-2.0.gir \
+ --include=$(srcdir)/fontconfig-2.0.gir \
--library=pangoft2-1.0 \
$(NOCLOSURE) \
--output $@ \
@@ -103,14 +104,14 @@
-I$(PANGO_INCLUDEDIR) \
$(PANGO_INCLUDEDIR)/pango/pangoft2.h \
$(PANGO_INCLUDEDIR)/pango/pangofc-*.h
-BUILT_GIRSOURCES += PangoFT2.gir
+BUILT_GIRSOURCES += PangoFT2-1.0.gir
PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
-PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace PangoCairo \
- --include=GObject.gir \
- --include=Pango.gir \
- --include=$(srcdir)/cairo.gir \
+PangoCairo-1.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
+ --include=GObject-2.0.gir \
+ --include=./Pango-1.0.gir \
+ --include=$(srcdir)/cairo-1.0.gir \
--library=pangocairo-1.0 \
$(NOCLOSURE) \
--output $@ \
@@ -119,15 +120,15 @@
--pkg pangocairo \
-I$(PANGO_INCLUDEDIR) \
$(PANGO_INCLUDEDIR)/pango/pangocairo.h
-BUILT_GIRSOURCES += PangoCairo.gir
+BUILT_GIRSOURCES += PangoCairo-1.0.gir
PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace PangoXft \
- --include=GObject.gir \
- --include=$(srcdir)/xft.gir \
- --include=$(srcdir)/xlib.gir \
- --include=$(srcdir)/PangoFT2.gir \
+PangoXft-1.0.gir: fontconfig-2.0.gir xft-2.0.gir xlib-2.0.gir Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace PangoXft --nsversion=2.0 \
+ --include=GObject-2.0.gir \
+ --include=$(srcdir)/xft-2.0.gir \
+ --include=$(srcdir)/xlib-2.0.gir \
+ --include=$(srcdir)/PangoFT2-1.0.gir \
--library=pangoxft-1.0 \
$(NOCLOSURE) \
--output $@ \
@@ -137,14 +138,14 @@
-I$(PANGO_INCLUDEDIR) \
$(PANGO_INCLUDEDIR)/pango/pangoxft.h \
$(PANGO_INCLUDEDIR)/pango/pangoxft-render.h
-BUILT_GIRSOURCES += PangoXft.gir
+BUILT_GIRSOURCES += PangoXft-1.0.gir
PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace PangoX \
- --include=GObject.gir \
- --include=$(srcdir)/xlib.gir \
- --include=Pango.gir \
+PangoX-1.0.gir: xlib-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace PangoX --nsversion=1.0 \
+ --include=GObject-2.0.gir \
+ --include=$(srcdir)/xlib-2.0.gir \
+ --include=./Pango-1.0.gir \
--library=pangox-1.0 \
$(NOCLOSURE) \
--output $@ \
@@ -153,19 +154,19 @@
--pkg pangox \
-I$(PANGO_INCLUDEDIR) \
$(PANGO_INCLUDEDIR)/pango/pangox.h
-BUILT_GIRSOURCES += PangoX.gir
+BUILT_GIRSOURCES += PangoX-1.0.gir
endif
#poppler
if BUILD_POPPLER
POPPLER_INCLUDEDIR=`pkg-config --variable=includedir poppler-glib`/poppler
POPPLER_LIBDIR=`pkg-config --variable=libdir poppler-glib`
-PopplerGlib.gir: Gdk.gir Pango.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace PopplerGlib \
- --include=GObject.gir \
- --include=$(srcdir)/Pango.gir \
- --include=$(srcdir)/Gdk.gir \
- --include=$(srcdir)/cairo.gir \
+PopplerGlib-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace PopplerGlib --nsversion=0.8 \
+ --include=GObject-2.0.gir \
+ --include=$(srcdir)/Pango-1.0.gir \
+ --include=$(srcdir)/Gdk-2.0.gir \
+ --include=$(srcdir)/cairo-1.0.gir \
--library=poppler-glib \
$(NOCLOSURE) \
--output $@ \
@@ -173,32 +174,32 @@
--pkg gobject-2.0 \
-I$(POPPLER_INCLUDEDIR) \
$(POPPLER_INCLUDEDIR)/glib/*.h
-BUILT_GIRSOURCES += PopplerGlib.gir
+BUILT_GIRSOURCES += PopplerGlib-0.8.gir
endif
# atk
if BUILD_ATK
ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
ATK_LIBDIR=`pkg-config --variable=libdir atk`
-Atk.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Atk \
- --include=GObject.gir \
+Atk-1.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Atk --nsversion=1.0 \
+ --include=GObject-2.0.gir \
--library=atk-1.0 \
$(NOCLOSURE) \
--output $@ \
--pkg gobject-2.0 \
-I$(ATK_INCLUDEDIR) \
$(ATK_INCLUDEDIR)/atk/*.h
-BUILT_GIRSOURCES += Atk.gir
+BUILT_GIRSOURCES += Atk-1.0.gir
endif
# gdk
if BUILD_GTK
GDKPIXBUF_INCLUDEDIR=`pkg-config --variable=includedir gdk-pixbuf-2.0`/gtk-2.0
GDKPIXBUF_LIBDIR=`pkg-config --variable=libdir gdk-pixbuf-2.0`
-GdkPixbuf.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
- --include=Gio.gir \
+GdkPixbuf-2.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace GdkPixbuf --nsversion=2.0 --strip-prefix=Gdk\
+ --include=Gio-2.0.gir \
--library=gdk_pixbuf-2.0 \
$(NOCLOSURE) \
--output $@ \
@@ -206,18 +207,18 @@
--pkg gio-2.0 \
-I$(GDKPIXBUF_INCLUDEDIR) \
$(GDKPIXBUF_INCLUDEDIR)/gdk-pixbuf/*.h
-BUILT_GIRSOURCES += GdkPixbuf.gir
-XPATH_TESTS += GdkPixbuf.xpath
+BUILT_GIRSOURCES += GdkPixbuf-2.0.gir
+XPATH_TESTS += GdkPixbuf-2.0.xpath
GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
-Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Gdk \
- --include=Gio.gir \
- --include=$(srcdir)/cairo.gir \
- --include=Pango.gir \
- --include=$(srcdir)/xlib.gir \
- --include=GdkPixbuf.gir \
+Gdk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir xlib-2.0.gir GdkPixbuf-2.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Gdk --nsversion=2.0 \
+ --include=Gio-2.0.gir \
+ --include=$(srcdir)/cairo-1.0.gir \
+ --include=./Pango-1.0.gir \
+ --include=$(srcdir)/xlib-2.0.gir \
+ --include=./GdkPixbuf-2.0.gir \
--library=gdk-x11-2.0 \
$(NOCLOSURE) \
--output $@ \
@@ -230,19 +231,19 @@
-I$(GDK_INCLUDEDIR) \
$(srcdir)/gdk-x11-2.0.c \
$(GDK_INCLUDEDIR)/gdk/*.h
-BUILT_GIRSOURCES += Gdk.gir
+BUILT_GIRSOURCES += Gdk-2.0.gir
# gtk
GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-2.0`/gtk-2.0
GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
-Gtk.gir: cairo.gir Pango.gir Atk.gir xlib.gir GdkPixbuf.gir Gdk.gir gtk-x11-2.0.c $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Gtk \
- --include=Gio.gir \
- --include=$(srcdir)/cairo.gir \
- --include=Pango.gir \
- --include=Atk.gir \
- --include=GdkPixbuf.gir \
- --include=Gdk.gir \
+Gtk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir Atk-1.0.gir xlib-2.0.gir GdkPixbuf-2.0.gir Gdk-2.0.gir gtk-x11-2.0.c $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Gtk --nsversion=2.0 \
+ --include=Gio-2.0.gir \
+ --include=$(srcdir)/cairo-1.0.gir \
+ --include=./Pango-1.0.gir \
+ --include=./Atk-1.0.gir \
+ --include=./GdkPixbuf-2.0.gir \
+ --include=./Gdk-2.0.gir \
--library=gtk-x11-2.0 \
$(NOCLOSURE) \
--pkg gobject-2.0 \
@@ -259,19 +260,19 @@
-I$(GTK_INCLUDEDIR) \
$(srcdir)/gtk-x11-2.0.c \
$(GTK_INCLUDEDIR)/gtk/*.h
-BUILT_GIRSOURCES += Gtk.gir
-XPATH_TESTS += Gtk.xpath
+BUILT_GIRSOURCES += Gtk-2.0.gir
+XPATH_TESTS += Gtk-2.0.xpath
endif
# webkit
if BUILD_WEBKIT
WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
WEBKIT_LIBDIR=`pkg-config --variable=libdir webkit-1.0`
-WebKit.gir: JSCore.gir Gtk.gir $(G_IR_SCANNER)
- $(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit \
- --include=GObject.gir \
- --include=Gtk.gir \
- --include=JSCore.gir \
+WebKit-1.0.gir: JSCore-1.0.gir Gtk-2.0.gir $(G_IR_SCANNER)
+ $(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
+ --include=GObject-2.0.gir \
+ --include=./Gtk-2.0.gir \
+ --include=$(srcdir)/JSCore-1.0.gir \
--library=webkit-1.0 \
$(NOCLOSURE) \
--pkg gobject-2.0 \
@@ -280,57 +281,57 @@
--output $@ \
-I$(WEBKIT_INCLUDEDIR) \
$(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
-BUILT_GIRSOURCES += WebKit.gir
-CUSTOM_GIRSOURCES += JSCore.gir
-XPATH_TESTS += WebKit.xpath
+BUILT_GIRSOURCES += WebKit-1.0.gir
+CUSTOM_GIRSOURCES += JSCore-1.0.gir
+XPATH_TESTS += WebKit-1.0.xpath
endif BUILD_WEBKIT
# libnotify
if BUILD_NOTIFY
NOTIFY_INCLUDEDIR=`pkg-config --variable=includedir libnotify`
NOTIFY_LIBDIR=`pkg-config --variable=libdir libnotify`
-Notify.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Notify \
- --include=Gtk.gir \
+Notify-0.4.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Notify --nsversion=0.4 \
+ --include=./Gtk-2.0.gir \
--library=notify \
$(NOCLOSURE) \
--pkg gtk+-2.0 \
--output $@ \
-I$(NOTIFY_INCLUDEDIR) \
$(NOTIFY_INCLUDEDIR)/libnotify/*.h
-BUILT_GIRSOURCES += Notify.gir
+BUILT_GIRSOURCES += Notify-0.4.gir
endif
# gtksourceview
if BUILD_GTKSOURCEVIEW
GTKSOURCEVIEW_INCLUDEDIR=`pkg-config --variable=includedir gtksourceview-2.0`/gtksourceview-2.0
GTKSOURCEVIEW_LIBDIR=`pkg-config --variable=libdir gtksourceview-2.0`
-GtkSource.gir: $(G_IR_SCANNER) Gtk.gir
- $(G_IR_SCANNER) -v --namespace GtkSource \
- --include=Gtk.gir \
+GtkSource-2.2.gir: $(G_IR_SCANNER) Gtk-2.0.gir
+ $(G_IR_SCANNER) -v --namespace GtkSource --nsversion=2.2 \
+ --include=./Gtk-2.0.gir \
--library=gtksourceview-2.0 \
$(NOCLOSURE) \
--pkg gtk+-2.0 \
--output $@ \
-I$(GTKSOURCEVIEW_INCLUDEDIR) \
$(GTKSOURCEVIEW_INCLUDEDIR)/gtksourceview/*.h
-BUILT_GIRSOURCES += GtkSource.gir
+BUILT_GIRSOURCES += GtkSource-2.2.gir
endif
# vte
if BUILD_VTE
VTE_INCLUDEDIR=`pkg-config --variable=includedir vte`
VTE_LIBDIR=`pkg-config --variable=libdir vte`
-Vte.gir: $(G_IR_SCANNER) Gtk.gir
- $(G_IR_SCANNER) -v --namespace Vte \
- --include=Gtk.gir \
+Vte-1.0.gir: $(G_IR_SCANNER) Gtk-2.0.gir
+ $(G_IR_SCANNER) -v --namespace Vte --nsversion=1.0 \
+ --include=./Gtk-2.0.gir \
--library=vte \
$(NOCLOSURE) \
--pkg gtk+-2.0 \
--output $@ \
-I$(VTE_INCLUDEDIR) \
$(VTE_INCLUDEDIR)/vte/*.h
-BUILT_GIRSOURCES += Vte.gir
+BUILT_GIRSOURCES += Vte-1.0.gir
endif
# clutter
@@ -351,9 +352,9 @@
CLUTTER_INCLUDEDIR=`pkg-config --variable=includedir clutter-0.8`
CLUTTER_LIBDIR=`pkg-config --variable=libdir clutter-0.8`
-ClutterJson.gir: $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace ClutterJson \
- --include=GObject.gir \
+ClutterJson-1.0.gir: $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace ClutterJson --nsversion=1.0 \
+ --include=GObject-2.0.gir \
--library=clutter-glx-0.8 \
$(NOCLOSURE) \
--pkg gobject-2.0 \
@@ -362,16 +363,16 @@
-I$(CLUTTER_INCLUDEDIR) \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/json/*.h
-Clutter.gir: libgirepo-Clutter-custom.la ClutterJson.gir ClutterAdditions.xml GdkPixbuf.gir Pango.gir PangoCairo.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace Clutter \
+Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterAdditions.xml ClutterJson-1.0.gir GdkPixbuf-2.0.gir Pango-1.0.gir PangoCairo-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace Clutter --nsversion=0.8 \
--strip-prefix=girepo \
- --include=$(srcdir)/GL.gir \
- --include=GObject.gir \
- --include=$(srcdir)/xlib.gir \
- --include=Pango.gir \
- --include=PangoCairo.gir \
- --include=GdkPixbuf.gir \
- --include=ClutterJson.gir \
+ --include=$(srcdir)/GL-1.0.gir \
+ --include=GObject-2.0.gir \
+ --include=$(srcdir)/xlib-2.0.gir \
+ --include=./Pango-1.0.gir \
+ --include=./PangoCairo-1.0.gir \
+ --include=./GdkPixbuf-2.0.gir \
+ --include=./ClutterJson-1.0.gir \
--library=clutter-glx-0.8 \
--library=libgirepo-Clutter-custom.la \
$(NOCLOSURE) \
@@ -379,21 +380,22 @@
--pkg clutter-0.8 \
--output $@ \
-I$(CLUTTER_INCLUDEDIR) \
+ $(builddir)/Clutter-custom.h \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/cogl/*.h \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter/*.h
$(G_IR_SCANNER) --inject $@ ClutterAdditions.xml $@
-BUILT_GIRSOURCES += Clutter.gir ClutterJson.gir
+BUILT_GIRSOURCES += Clutter-0.8.gir ClutterJson-1.0.gir
endif BUILD_CLUTTER
if BUILD_CLUTTERGTK
CLUTTERGTK_INCLUDEDIR=`pkg-config --variable=includedir clutter-gtk-0.8`
CLUTTERGTK_LIBDIR=`pkg-config --variable=libdir clutter-gtk-0.8`
-ClutterGtk.gir: Clutter.gir Gtk.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace ClutterGtk \
- --include=$(srcdir)/GL.gir \
- --include=GObject.gir \
- --include=Gtk.gir \
- --include=Clutter.gir \
+ClutterGtk-0.8.gir: Clutter-0.8.gir Gtk-2.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace ClutterGtk --nsversion=0.8 \
+ --include=$(srcdir)/GL-1.0.gir \
+ --include=GObject-2.0.gir \
+ --include=./Gtk-2.0.gir \
+ --include=./Clutter-0.8.gir \
--library=clutter-gtk-0.8 \
$(NOCLOSURE) \
--pkg gobject-2.0 \
@@ -402,16 +404,16 @@
--output $@ \
-I$(CLUTTER_INCLUDEDIR) \
$(CLUTTER_INCLUDEDIR)/clutter-0.8/clutter-gtk/*.h
-BUILT_GIRSOURCES += ClutterGtk.gir
+BUILT_GIRSOURCES += ClutterGtk-0.8.gir
endif BUILD_CLUTTERGTK
if BUILD_CLUTTERCAIRO
CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.8`
CLUTTERCAIRO_LIBDIR=`pkg-config --variable=libdir clutter-cairo-0.8`
-ClutterCairo.gir: Clutter.gir cairo.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace ClutterCairo \
- --include=cairo.gir \
- --include=Clutter.gir \
+ClutterCairo-0.8.gir: Clutter-0.8.gir $(srcdir)/cairo-1.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace ClutterCairo --nsversion=0.8 \
+ --include=$(srcdir)/cairo-1.0.gir \
+ --include=./Clutter-0.8.gir \
--library=clutter-cairo-0.8 \
$(NOCLOSURE) \
--pkg gobject-2.0 \
@@ -420,34 +422,34 @@
--output $@ \
-I$(CLUTTERCAIRO_INCLUDEDIR) \
$(CLUTTERCAIRO_INCLUDEDIR)/clutter-0.8/clutter-cairo/*.h
-BUILT_GIRSOURCES += ClutterCairo.gir
+BUILT_GIRSOURCES += ClutterCairo-0.8.gir
endif BUILD_CLUTTERCAIRO
if BUILD_GOOCANVAS
GOOCANVAS_INCLUDEDIR=`pkg-config --variable=includedir goocanvas`
GOOCANVAS_LIBDIR=`pkg-config --variable=libdir goocanvas`
-GooCanvas.gir: Gtk.gir $(G_IR_SCANNER)
- $(G_IR_SCANNER) -v --namespace GooCanvas \
+GooCanvas-0.10.gir: Gtk-2.0.gir $(G_IR_SCANNER)
+ $(G_IR_SCANNER) -v --namespace GooCanvas --nsversion=0.10 \
--strip-prefix=Goo \
- --include=Gtk.gir \
+ --include=./Gtk-2.0.gir \
--library=goocanvas \
$(NOCLOSURE) \
--pkg goocanvas \
--output $@ \
-I$(GOOCANVAS_INCLUDEDIR) \
$(GOOCANVAS_INCLUDEDIR)/goocanvas-1.0/*.h
-BUILT_GIRSOURCES += GooCanvas.gir
+BUILT_GIRSOURCES += GooCanvas-0.10.gir
endif BUILD_GOOCANVAS
# GStreamer
if BUILD_GSTREAMER
GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
GST_LIBDIR=`pkg-config --variable=libdir gstreamer-0.10`
-Gst.gir: libxml2.gir $(G_IR_SCANNER)
- $(DEBUG) $(G_IR_SCANNER) -v --namespace Gst \
- --include=GObject.gir \
- --include=GModule.gir \
- --include=libxml2.gir \
+Gst-0.10.gir: libxml2-2.0.gir $(G_IR_SCANNER)
+ $(DEBUG) $(G_IR_SCANNER) -v --namespace Gst --nsversion=0.10 \
+ --include=GObject-2.0.gir \
+ --include=GModule-2.0.gir \
+ --include=$(srcdir)/libxml2-2.0.gir \
--library=gstreamer-0.10 \
$(NOCLOSURE) \
--pkg gobject-2.0 \
@@ -507,13 +509,13 @@
$(GST_INCLUDEDIR)/gst/gstversion.h \
$(GST_INCLUDEDIR)/gst/gstxml.h
-BUILT_GIRSOURCES += Gst.gir
+BUILT_GIRSOURCES += Gst-0.10.gir
endif BUILD_GSTREAMER
if BUILD_MISSIONCONTROL
MISSIONCONTROL_INCLUDEDIR=`pkg-config --variable=includedir libmissioncontrol`
MISSIONCONTROL_LIBDIR=`pkg-config --variable=libdir libmissioncontrol`
-MissionControl.gir: $(G_IR_SCANNER)
+MissionControl.gir: $(G_IR_SCANNER)
$(G_IR_SCANNER) -v --namespace MissionControl \
--strip-prefix=mc \
--include=$(srcdir)/LibTelepathy.gir \
@@ -546,10 +548,10 @@
%.xpath.test: %.xpath
$(G_IR_SCANNER) --xpath-assertions=$*.xpath $*.gir
-%.typelib: %.gir
+%.typelib: %.gir
$(DEBUG) $(G_IR_COMPILER) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
-%.typelib.gdb: %.gir
+%.typelib.gdb: %.gir
libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $@
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA:.typelib=.typelib.xml) $(typelibs_DATA:.typelib=.typelib.xml.typelib)
@@ -557,6 +559,7 @@
check-local: $(XPATH_TESTS:.xpath=.xpath.test)
check-local: $(typelibs_DATA)
- for x in $(typelibs_DATA); do \
+ @for x in $(typelibs_DATA); do \
+ echo 1>&2 "$(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml;" \
$(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
done
Copied: trunk/gir/cairo-1.0.gir (from r115, /trunk/gir/cairo.gir)
==============================================================================
--- /trunk/gir/cairo.gir (original)
+++ trunk/gir/cairo-1.0.gir Sun Oct 12 04:53:58 2008
@@ -3,7 +3,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="cairo" shared-library="cairo">
+ <namespace name="cairo" version="1.0" shared-library="cairo">
<record name="Context" c:type="cairo_t"
glib:type-name="CairoContext"
glib:get-type="cairo_get_g_type"/>
Copied: trunk/gir/fontconfig-2.0.gir (from r115, /trunk/gir/fontconfig.gir)
==============================================================================
--- /trunk/gir/fontconfig.gir (original)
+++ trunk/gir/fontconfig-2.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="fontconfig" shared-library="fontconfig">
+ <namespace name="fontconfig" version="2.0" shared-library="fontconfig">
<record name="Pattern" c:type="FcPattern"/>
<record name="CharSet" c:type="FcCharSet"/>
<function name="init" c:identifier="FcInit">
Copied: trunk/gir/freetype2-2.0.gir (from r115, /trunk/gir/freetype2.gir)
==============================================================================
--- /trunk/gir/freetype2.gir (original)
+++ trunk/gir/freetype2-2.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="freetype2" shared-library="freetype">
+ <namespace name="freetype2" version="2.0" shared-library="freetype">
<record name="Bitmap" c:type="FT_Bitmap"/>
<record name="Face" c:type="FT_Face"/>
<function name="library_version" c:identifier="FT_Library_Version">
Copied: trunk/gir/libxml2-2.0.gir (from r115, /trunk/gir/libxml2.gir)
==============================================================================
--- /trunk/gir/libxml2.gir (original)
+++ trunk/gir/libxml2-2.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="libxml2" shared-library="libxml2">
+ <namespace name="libxml2" version="2.0" shared-library="libxml2">
<record name="NodePtr" c:type="xmlNodePtr"/>
<record name="DocPtr" c:type="xmlDocPtr"/>
<function name="dummy" c:identifier="dummy">
Copied: trunk/gir/xft-2.0.gir (from r115, /trunk/gir/xft.gir)
==============================================================================
--- /trunk/gir/xft.gir (original)
+++ trunk/gir/xft-2.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="xft" shared-library="Xft">
+ <namespace name="xft" version="2.0" shared-library="Xft">
<record name="Color" c:type="XftColor"/>
<record name="Draw" c:type="XftDraw"/>
Copied: trunk/gir/xlib-2.0.gir (from r115, /trunk/gir/xlib.gir)
==============================================================================
--- /trunk/gir/xlib.gir (original)
+++ trunk/gir/xlib-2.0.gir Sun Oct 12 04:53:58 2008
@@ -1,7 +1,7 @@
<repository version="1.0"
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
- <namespace name="xlib" shared-library="X11">
+ <namespace name="xlib" version="2.0" shared-library="X11">
<record name="Atom" c:type="Atom"/>
<record name="Display" c:type="Display"/>
<record name="Drawable" c:type="Drawable"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
