com gtk/php-gtk: Added a script to modify the default generator's output for sourceview and mozembed.: ext/mozembed/Makefile.frag ext/mozembed/modifyGenerated.php ext/mozembed/mozembed.defs ext/sourceview/Makefile.frag ext/sourceview/modifyGenerated.php ext/sourceview/sourceview.defs

Commit:    382fca79214fba616cb38fcbe0d7b8695cb607d6
Author:    Anant Narayanan <[email protected]>         Sun, 19 Mar 2006 04:03:25 +0000
Parents:   9708cf1a706a3386db63731f53012986f4c1ea3c
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=382fca79214fba616cb38fcbe0d7b8695cb607d6

Log:
Added a script to modify the default generator's output for sourceview and
mozembed.

Changed paths:
  M  ext/mozembed/Makefile.frag
  A  ext/mozembed/modifyGenerated.php
  M  ext/mozembed/mozembed.defs
  M  ext/sourceview/Makefile.frag
  A  ext/sourceview/modifyGenerated.php
  M  ext/sourceview/sourceview.defs


Diff:
382fca79214fba616cb38fcbe0d7b8695cb607d6
diff --git a/ext/mozembed/Makefile.frag b/ext/mozembed/Makefile.frag
index ef7801e..3310e6a 100644
--- a/ext/mozembed/Makefile.frag
+++ b/ext/mozembed/Makefile.frag
@@ -10,5 +10,6 @@ $(builddir)/gen_mozembed.c: $(srcdir)/mozembed.defs $(srcdir)/mozembed.overrides
 		-o ext/mozembed/mozembed.overrides \
         -p GtkMozembed \
 		-f $@ ext/mozembed/mozembed.defs \
+	 && $(PHP) $(srcdir)/modifyGenerated.php \
      && grep -h "^PHP_GTK_EXPORT_CE" $@ | sed -e "s!^!extern !" > $(@D)/$(*F).h \
 	)
diff --git a/ext/mozembed/modifyGenerated.php b/ext/mozembed/modifyGenerated.php
new file mode 100644
index 0000000..15db9b1
--- /dev/null
+++ b/ext/mozembed/modifyGenerated.php
@@ -0,0 +1,21 @@
+<?php
+
+/* Ugly, Ugly way of exporting gtkbin for mozembed */
+$contents = file("ext/mozembed/gen_mozembed.c");
+$tmpFile = fopen("ext/mozembed/gen_temp.c", "w+");
+
+for($i=0; $i<5; $i++) {
+    fwrite($tmpFile, $contents[$i]);
+}
+
+fwrite($tmpFile, "\nPHP_GTK_EXPORT_CE(gtkbin_ce);\n");
+
+for($i=6; $i<=count($contents); $i++) {
+    fwrite($tmpFile, $contents[$i]);
+}
+
+fclose($tmpFile);
+$toPut = file("ext/mozembed/gen_temp.c");
+file_put_contents("ext/mozembed/gen_mozembed.c", $toPut);
+
+?>
diff --git a/ext/mozembed/mozembed.defs b/ext/mozembed/mozembed.defs
index 750d20b..e89e5ab 100644
--- a/ext/mozembed/mozembed.defs
+++ b/ext/mozembed/mozembed.defs
@@ -146,59 +146,3 @@
   (c-name "gtk_moz_embed_get_chrome_mask")
   (return-type "guint32")
 )
-
-;; Added to stop errors
-(define-object Frame
-  (in-module "Gtk")
-  (parent "GtkBin")
-  (c-name "GtkFrame")
-  (gtype-id "GTK_TYPE_FRAME")
-)
-
-(define-object Bin
-  (in-module "Gtk")
-  (parent "GtkContainer")
-  (c-name "GtkBin")
-  (gtype-id "GTK_TYPE_BIN")
-  (fields
-    '("GtkWidget*" "child")
-  )
-)
-
-(define-object Container
-  (in-module "Gtk")
-  (parent "GtkWidget")
-  (c-name "GtkContainer")
-  (gtype-id "GTK_TYPE_CONTAINER")
-  (fields
-    '("GtkWidget*" "focus_child")
-    '("guint" "border_width")
-    '("guint" "need_resize")
-    '("guint" "resize_mode")
-    '("guint" "reallocate_redraws")
-    '("guint" "has_focus_chain")
-  )
-)
-
-(define-object Widget
-  (in-module "Gtk")
-  (parent "GtkObject")
-  (c-name "GtkWidget")
-  (gtype-id "GTK_TYPE_WIDGET")
-  (fields
-    '("guint8" "state")
-    '("guint8" "saved_state")
-    '("gchar*" "name")
-    '("GtkStyle*" "style")
-    '("GdkRectangle" "allocation")
-    '("GdkWindow*" "window")
-    '("GtkWidget*" "parent")
-  )
-)
-
-(define-object Object
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkObject")
-  (gtype-id "GTK_TYPE_OBJECT")
-)
diff --git a/ext/sourceview/Makefile.frag b/ext/sourceview/Makefile.frag
index 945d378..2ecd2cc 100644
--- a/ext/sourceview/Makefile.frag
+++ b/ext/sourceview/Makefile.frag
@@ -10,5 +10,6 @@ $(builddir)/gen_sourceview.c: $(srcdir)/sourceview.defs $(srcdir)/sourceview.ove
 		-o ext/sourceview/sourceview.overrides \
         -p GtkSourceView \
 		-f $@ ext/sourceview/sourceview.defs \
+	 && $(PHP) $(srcdir)/modifyGenerated.php \
      && grep -h "^PHP_GTK_EXPORT_CE" $@ | sed -e "s!^!extern !" > $(@D)/$(*F).h \
 	)
diff --git a/ext/sourceview/modifyGenerated.php b/ext/sourceview/modifyGenerated.php
new file mode 100644
index 0000000..147bf6a
--- /dev/null
+++ b/ext/sourceview/modifyGenerated.php
@@ -0,0 +1,21 @@
+<?php
+
+/* Ugly, Ugly way of exporting gtkcontainer for sourceview */
+$contents = file("ext/sourceview/gen_sourceview.c");
+$tmpFile = fopen("ext/sourceview/gen_temp.c", "w+");
+
+for($i=0; $i<5; $i++) {
+    fwrite($tmpFile, $contents[$i]);
+}
+
+fwrite($tmpFile, "\nPHP_GTK_EXPORT_CE(gtkcontainer_ce);\n");
+
+for($i=5; $i<=count($contents); $i++) {
+    fwrite($tmpFile, $contents[$i]);
+}
+
+fclose($tmpFile);
+$toPut = file("ext/sourceview/gen_temp.c");
+file_put_contents("ext/sourceview/gen_sourceview.c", $toPut);
+
+?>
diff --git a/ext/sourceview/sourceview.defs b/ext/sourceview/sourceview.defs
index 6892f26..584d7a3 100644
--- a/ext/sourceview/sourceview.defs
+++ b/ext/sourceview/sourceview.defs
@@ -1265,41 +1265,3 @@
   (c-name "GtkTextMark")
   (gtype-id "GTK_TYPE_TEXT_MARK")
 )
-
-(define-object Container
-  (in-module "Gtk")
-  (parent "GtkWidget")
-  (c-name "GtkContainer")
-  (gtype-id "GTK_TYPE_CONTAINER")
-  (fields
-    '("GtkWidget*" "focus_child")
-    '("guint" "border_width")
-    '("guint" "need_resize")
-    '("guint" "resize_mode")
-    '("guint" "reallocate_redraws")
-    '("guint" "has_focus_chain")
-  )
-)
-
-(define-object Widget
-  (in-module "Gtk")
-  (parent "GtkObject")
-  (c-name "GtkWidget")
-  (gtype-id "GTK_TYPE_WIDGET")
-  (fields
-    '("guint8" "state")
-    '("guint8" "saved_state")
-    '("gchar*" "name")
-    '("GtkStyle*" "style")
-    '("GdkRectangle" "allocation")
-    '("GdkWindow*" "window")
-    '("GtkWidget*" "parent")
-  )
-)
-
-(define-object Object
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkObject")
-  (gtype-id "GTK_TYPE_OBJECT")
-)