gir-repository r52 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Thu Aug 21 20:31:59 2008
New Revision: 52
URL: http://svn.gnome.org/viewvc/gir-repository?rev=52&view=rev

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

    * gir/JSCore.gir:
    * gir/Makefile.am:
    Add manually written JSCore and scan WebKit



Added:
   trunk/gir/JSCore.gir
Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Added: trunk/gir/JSCore.gir
==============================================================================
--- (empty file)
+++ trunk/gir/JSCore.gir	Thu Aug 21 20:31:59 2008
@@ -0,0 +1,17 @@
+<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">
+    <alias name="GlobalContextRef"
+           target="none"
+           c:type="JSGlobalContextRef"/>
+    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
+    <function name="EvaluateScript" c:identifier="JSEvaluateScript">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+      </parameters>
+    </function>
+  </namespace>
+</repository>

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Aug 21 20:31:59 2008
@@ -6,7 +6,7 @@
 # pango
 PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
 PANGO_LIBDIR=`pkg-config --variable=libdir pango`
-Pango.gir: Makefile $(G_IR_SCANNER)
+Pango.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Pango \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -22,7 +22,7 @@
 BUILT_GIRSOURCES += Pango.gir
 
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir Makefile $(G_IR_SCANNER)
+PangoFT2.gir: fontconfig.gir freetype2.gir Pango.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoFT2 \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -41,7 +41,7 @@
 BUILT_GIRSOURCES += PangoFT2.gir
 
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
-PangoCairo.gir: cairo.gir Pango.gir Makefile $(G_IR_SCANNER)
+PangoCairo.gir: cairo.gir Pango.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -58,7 +58,7 @@
 BUILT_GIRSOURCES += PangoCairo.gir
 
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir Makefile $(G_IR_SCANNER)
+PangoXft.gir: fontconfig.gir xft.gir xlib.gir Pango.gir PangoFT2.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoXft \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -79,7 +79,7 @@
 BUILT_GIRSOURCES += PangoXft.gir
 
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-PangoX.gir: xlib.gir Pango.gir Makefile $(G_IR_SCANNER)
+PangoX.gir: xlib.gir Pango.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoX \
             --include=$(GIRDIR)/GLib.gir \
             --include=$(GIRDIR)/GObject.gir \
@@ -98,7 +98,7 @@
 # atk
 ATK_INCLUDEDIR=`pkg-config --variable=includedir atk`/atk-1.0
 ATK_LIBDIR=`pkg-config --variable=libdir atk`
-Atk.gir: Makefile $(G_IR_SCANNER)
+Atk.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Atk \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -113,7 +113,7 @@
 # gdk
 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: Makefile $(G_IR_SCANNER)
+GdkPixbuf.gir: $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GdkPixbuf --strip-prefix=Gdk \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -129,7 +129,7 @@
 
 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 Makefile $(G_IR_SCANNER)
+Gdk.gir: cairo.gir Pango.gir xlib.gir GdkPixbuf.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gdk \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -155,7 +155,7 @@
 # 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 Makefile $(G_IR_SCANNER)
+Gtk.gir: cairo.gir Pango.gir Atk.gir xlib.gir GdkPixbuf.gir Gdk.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gtk \
              --include=$(GIRDIR)/GLib.gir \
              --include=$(GIRDIR)/GObject.gir \
@@ -183,6 +183,27 @@
              $(GTK_INCLUDEDIR)/gtk/*.h
 BUILT_GIRSOURCES += Gtk.gir
 
+# 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)
+	$(G_IR_SCANNER) -v --namespace WebKit \
+             --include=$(GIRDIR)/GLib.gir \
+             --include=$(GIRDIR)/GObject.gir \
+             --include=$(srcdir)/Gtk.gir \
+             --include=$(srcdir)/JSCore.gir \
+	     --library=webkit-1.0 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg gtk+-2.0 \
+             --pkg webkit-1.0 \
+             --output $@ \
+	     -I$(WEBKIT_INCLUDEDIR) \
+             $(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
+BUILT_GIRSOURCES += WebKit.gir
+CUSTOM_GIRSOURCES += JSCore.gir
+
 girdir = $(datadir)/gir
 dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)