cvs: php-gtk /ext/gtk+ gdk-2.12.overrides gdk.overrides gtk-2.10.overrides gtk-2.12.overrides gtk-2.8.overrides gtk.overrides /generator override.php
scheme.php

sfox Tue Jan 22 18:47:34 2008 UTC Modified files: /php-gtk/ext/gtk+ gdk-2.12.overrides gdk.overrides gtk-2.10.overrides gtk-2.12.overrides gtk-2.8.overrides gtk.overrides /php-gtk/generator override.php scheme.php Log: This works fine, but I forgot to move the defs to the new scheme. (Cue much confusion here - until now.)

http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.12.overrides?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gdk-2.12.overrides diff -u php-gtk/ext/gtk+/gdk-2.12.overrides:1.1 php-gtk/ext/gtk+/gdk-2.12.overrides:1.2 --- php-gtk/ext/gtk+/gdk-2.12.overrides:1.1 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gdk-2.12.overrides Tue Jan 22 18:47:34 2008 @@ -1,5 +1,7 @@ /* vim: set et ft=cpp fdm=marker: */ +%% include gdk.overrides + %% ignore-win32 gdk_x11_display_get_startup_notification_id -%% }}} \ No newline at end of file +%% }}} http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk.overrides?r1=1.79&r2=1.80&diff_format=u Index: php-gtk/ext/gtk+/gdk.overrides diff -u php-gtk/ext/gtk+/gdk.overrides:1.79 php-gtk/ext/gtk+/gdk.overrides:1.80 --- php-gtk/ext/gtk+/gdk.overrides:1.79 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gdk.overrides Tue Jan 22 18:47:34 2008 @@ -3075,5 +3075,3 @@ } %% }}} - -%% include gdk-2.12.overrides "2.12" http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk-2.10.overrides?r1=1.7&r2=1.8&diff_format=u Index: php-gtk/ext/gtk+/gtk-2.10.overrides diff -u php-gtk/ext/gtk+/gtk-2.10.overrides:1.7 php-gtk/ext/gtk+/gtk-2.10.overrides:1.8 --- php-gtk/ext/gtk+/gtk-2.10.overrides:1.7 Sat Nov 24 02:34:09 2007 +++ php-gtk/ext/gtk+/gtk-2.10.overrides Tue Jan 22 18:47:34 2008 @@ -1,4 +1,6 @@ /* vim: set et ft=cpp fdm=marker: */ +%% include gtk-2.8.overrides + %% headers static void phpg_link_button_set_uri_hook_func_marshal(GtkLinkButton *button, const gchar *link, gpointer data); @@ -645,4 +647,4 @@ ); } -%% }}} \ No newline at end of file +%% }}} http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk-2.12.overrides?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gtk-2.12.overrides diff -u php-gtk/ext/gtk+/gtk-2.12.overrides:1.1 php-gtk/ext/gtk+/gtk-2.12.overrides:1.2 --- php-gtk/ext/gtk+/gtk-2.12.overrides:1.1 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gtk-2.12.overrides Tue Jan 22 18:47:34 2008 @@ -0,0 +1 @@ +%% include gtk-2.10.overrides http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk-2.8.overrides?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gtk-2.8.overrides diff -u php-gtk/ext/gtk+/gtk-2.8.overrides:1.1 php-gtk/ext/gtk+/gtk-2.8.overrides:1.2 --- php-gtk/ext/gtk+/gtk-2.8.overrides:1.1 Mon May 14 13:08:40 2007 +++ php-gtk/ext/gtk+/gtk-2.8.overrides Tue Jan 22 18:47:34 2008 @@ -1,3 +1,5 @@ +%% include gtk.overrides + %% {{{ ignores %% @@ -284,4 +286,4 @@ } add_next_index_zval(return_value, php_end); } -%% }}} \ No newline at end of file +%% }}} http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk.overrides?r1=1.250&r2=1.251&diff_format=u Index: php-gtk/ext/gtk+/gtk.overrides diff -u php-gtk/ext/gtk+/gtk.overrides:1.250 php-gtk/ext/gtk+/gtk.overrides:1.251 --- php-gtk/ext/gtk+/gtk.overrides:1.250 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gtk.overrides Tue Jan 22 18:47:34 2008 @@ -6130,6 +6130,3 @@ %% include gtkstyle.overrides %% include gtktextview.overrides %% include gtktreeview.overrides -%% include gtk-2.8.overrides "2.8" -%% include gtk-2.10.overrides "2.10" -%% include gtk-2.12.overrides "2.12" http://cvs.php.net/viewvc.cgi/php-gtk/generator/override.php?r1=1.33&r2=1.34&diff_format=u Index: php-gtk/generator/override.php diff -u php-gtk/generator/override.php:1.33 php-gtk/generator/override.php:1.34 --- php-gtk/generator/override.php:1.33 Wed Jan 31 18:12:47 2007 +++ php-gtk/generator/override.php Tue Jan 22 18:47:34 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: override.php,v 1.33 2007/01/31 18:12:47 auroraeosrose Exp $ */ +/* $Id: override.php,v 1.34 2008/01/22 18:47:34 sfox Exp $ */ class Overrides { var $ignores = array(); @@ -39,19 +39,42 @@ var $lineinfo = array(); var $top_dir = ''; var $gtkversion = null; // gtk lib version + var $file_name = null; - function Overrides($file_name = null, $gtkversion = null) + public function __construct($file_name = null, $gtkversion = null) { - if (version_compare($gtkversion, '2.6', '<')) - { + if (version_compare($gtkversion, '2.6', '<')) { $gtkversion = '2.6'; } + $this->gtkversion = $gtkversion; - if (!isset($file_name)) + + if (!isset($file_name)) { return; + } + $this->_set_file_version($file_name, $gtkversion); $this->top_dir = getcwd(); - $this->read_file($file_name); + $this->read_file($this->file_name); + } + + private function _set_file_version($file_name, $gtkversion) + { + while (substr($gtkversion, 2) > 6) { + + $split = explode('.', $file_name); + $point = substr($gtkversion, 2); + $try = $split[0].'-'.$gtkversion.'.'.$split[1]; + + if (file_exists($try)) { + $file_name = $try; + break; + } + + $gtkversion = '2.'.($point - 2); + $this->_set_file_version($file_name, $gtkversion); + } + $this->file_name = $file_name; } function read_file($file_name) @@ -190,14 +213,7 @@ case 'include': $file_name = $words[0]; - // check for gtk lib version - if (!isset($words[1]) || version_compare($words[1], $this->gtkversion, '<=')) - { - $this->read_file($file_name); - } - foreach (preg_split(',\s+,', $rest, -1, PREG_SPLIT_NO_EMPTY) as $file_name) { - $this->read_file($file_name); - } + $this->read_file($file_name); break; case 'add': http://cvs.php.net/viewvc.cgi/php-gtk/generator/scheme.php?r1=1.30&r2=1.31&diff_format=u Index: php-gtk/generator/scheme.php diff -u php-gtk/generator/scheme.php:1.30 php-gtk/generator/scheme.php:1.31 --- php-gtk/generator/scheme.php:1.30 Tue May 22 03:29:58 2007 +++ php-gtk/generator/scheme.php Tue Jan 22 18:47:34 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: scheme.php,v 1.30 2007/05/22 03:29:58 auroraeosrose Exp $ */ +/* $Id: scheme.php,v 1.31 2008/01/22 18:47:34 sfox Exp $ */ require "definitions.php"; @@ -110,18 +110,21 @@ var $boxed = array(); // boxed types var $pointers = array(); // pointers var $c_name = array(); // C names of entities - var $gtkversion = null; // gtk lib version + var $gtkversion = null; // gtk lib version - function Defs_Parser($arg, $gtkversion = 0) + public function __construct($arg, $gtkversion = 0) { - if (version_compare($gtkversion, '2.6', '<')) - { + if (version_compare($gtkversion, '2.6', '<')) { $gtkversion = '2.6'; } + $this->gtkversion = $gtkversion; + switch (gettype($arg)) { case 'string': - $this->_parse_or_load($arg); + $this->file_name = $arg; + $this->file_path = dirname($arg); + $this->_parse_or_load(); break; case 'array': @@ -134,20 +137,18 @@ } } - function _parse_or_load($defs_file) + private function _parse_or_load() { - $cache_file = $defs_file.'.cache'; + $cache_file = $this->file_name.'.cache'; if (@is_file($cache_file) && - filemtime($cache_file) > filemtime($defs_file)) { - error_log('Loading cache "'. basename($cache_file) .'"'); + filemtime($cache_file) > filemtime($this->file_name)) { + error_log("Loading cache '". basename($cache_file) ."'"); $fp = fopen($cache_file, 'r'); $this->parse_cache = fread($fp, filesize($cache_file)); fclose($fp); } else { - $this->file_name = basename($defs_file); - $this->file_path = dirname($defs_file); - error_log("Parsing file \"$this->file_name\"."); - $this->parse_tree = parse($defs_file, 'r'); + error_log("Parsing file '$this->file_name'."); + $this->parse_tree = parse($this->file_name, 'r'); } } @@ -184,7 +185,7 @@ $this->objects = $objects; if (is_writeable($this->file_path)) { - $cache_file = $this->file_path . '/' . $this->file_name . '.cache'; + $cache_file = $this->file_name . '.cache'; $fp = fopen($cache_file, 'w'); fwrite($fp, $this->serialize()); fclose($fp); @@ -420,15 +421,15 @@ function handle_include($arg) { - $include_file = $this->file_path . "/" . $arg[0]; + $include_file = $this->file_path . DIRECTORY_SEPARATOR . $arg[0]; // check for gtk lib version if (isset($arg[1]) && version_compare($arg[1], $this->gtkversion, '>')) { - error_log("Ignoring \"$include_file\". - needs version {$arg[1]} and current version is {$this->gtkversion}"); + error_log("Ignoring '$include_file' - needs version {$arg[1]} and current version is {$this->gtkversion}"); } else { - error_log("Parsing file \"$include_file\"."); + error_log("Parsing file '$include_file'."); $include_tree = parse($include_file, 'r'); $this->start_parsing($include_tree); }