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

sfox Tue Jan 22 20:43:06 2008 UTC Modified files: /php-gtk/ext/gtk+ gdk-2.10.defs gdk-2.12.defs gdk.defs gtk-2.10.defs gtk-2.12.defs gtk-2.8.defs gtk.defs /php-gtk/generator override.php scheme.php Log: Defs should only include the previous version .defs file and the current types.defs file, if one exists. Note that def caches are now versioned. http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.10.defs?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gdk-2.10.defs diff -u php-gtk/ext/gtk+/gdk-2.10.defs:1.1 php-gtk/ext/gtk+/gdk-2.10.defs:1.2 --- php-gtk/ext/gtk+/gdk-2.10.defs:1.1 Mon May 14 13:08:40 2007 +++ php-gtk/ext/gtk+/gdk-2.10.defs Tue Jan 22 20:43:05 2008 @@ -1,3 +1,5 @@ +(include "gdk.defs") + ;; From gdkalias.h http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.12.defs?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gdk-2.12.defs diff -u php-gtk/ext/gtk+/gdk-2.12.defs:1.1 php-gtk/ext/gtk+/gdk-2.12.defs:1.2 --- php-gtk/ext/gtk+/gdk-2.12.defs:1.1 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gdk-2.12.defs Tue Jan 22 20:43:06 2008 @@ -1,3 +1,5 @@ +(include "gdk-2.10.defs") + ;; From gdkcolor.h (define-method to_string http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk.defs?r1=1.25&r2=1.26&diff_format=u Index: php-gtk/ext/gtk+/gdk.defs diff -u php-gtk/ext/gtk+/gdk.defs:1.25 php-gtk/ext/gtk+/gdk.defs:1.26 --- php-gtk/ext/gtk+/gdk.defs:1.25 Wed Nov 14 14:07:39 2007 +++ php-gtk/ext/gtk+/gdk.defs Tue Jan 22 20:43:06 2008 @@ -1,6 +1,4 @@ (include "gdk-types.defs") -(include "gdk-2.10.defs" "2.10") -(include "gdk-2.12.defs" "2.12") ;; Functions, constructors, and methods ... http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk-2.10.defs?r1=1.2&r2=1.3&diff_format=u Index: php-gtk/ext/gtk+/gtk-2.10.defs diff -u php-gtk/ext/gtk+/gtk-2.10.defs:1.2 php-gtk/ext/gtk+/gtk-2.10.defs:1.3 --- php-gtk/ext/gtk+/gtk-2.10.defs:1.2 Tue May 22 03:29:50 2007 +++ php-gtk/ext/gtk+/gtk-2.10.defs Tue Jan 22 20:43:06 2008 @@ -1,6 +1,6 @@ ;; -*- scheme -*- - (include "gtk-2.10-types.defs") +(include "gtk-2.8.defs") ;; From gtkaboutdialog.h http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk-2.12.defs?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gtk-2.12.defs diff -u php-gtk/ext/gtk+/gtk-2.12.defs:1.1 php-gtk/ext/gtk+/gtk-2.12.defs:1.2 --- php-gtk/ext/gtk+/gtk-2.12.defs:1.1 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gtk-2.12.defs Tue Jan 22 20:43:06 2008 @@ -1,6 +1,6 @@ ;; -*- scheme -*- - (include "gtk-2.12-types.defs") +(include "gtk-2.10.defs") ;; From gtkbuildable.h http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk-2.8.defs?r1=1.1&r2=1.2&diff_format=u Index: php-gtk/ext/gtk+/gtk-2.8.defs diff -u php-gtk/ext/gtk+/gtk-2.8.defs:1.1 php-gtk/ext/gtk+/gtk-2.8.defs:1.2 --- php-gtk/ext/gtk+/gtk-2.8.defs:1.1 Mon May 14 13:08:40 2007 +++ php-gtk/ext/gtk+/gtk-2.8.defs Tue Jan 22 20:43:06 2008 @@ -1,4 +1,5 @@ (include "gtk-2.8-types.defs") +(include "gtk.defs") (define-method get_wrap_license (of-object "GtkAboutDialog") http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk.defs?r1=1.55&r2=1.56&diff_format=u Index: php-gtk/ext/gtk+/gtk.defs diff -u php-gtk/ext/gtk+/gtk.defs:1.55 php-gtk/ext/gtk+/gtk.defs:1.56 --- php-gtk/ext/gtk+/gtk.defs:1.55 Wed Nov 14 14:07:40 2007 +++ php-gtk/ext/gtk+/gtk.defs Tue Jan 22 20:43:06 2008 @@ -1,8 +1,5 @@ (include "gtk-extrafuncs.defs") (include "gtk-types.defs") -(include "gtk-2.8.defs" "2.8") -(include "gtk-2.10.defs" "2.10") -(include "gtk-2.12.defs" "2.12") ;; Functions, constructors, and methods ... http://cvs.php.net/viewvc.cgi/php-gtk/generator/override.php?r1=1.34&r2=1.35&diff_format=u Index: php-gtk/generator/override.php diff -u php-gtk/generator/override.php:1.34 php-gtk/generator/override.php:1.35 --- php-gtk/generator/override.php:1.34 Tue Jan 22 18:47:34 2008 +++ php-gtk/generator/override.php Tue Jan 22 20:43:06 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: override.php,v 1.34 2008/01/22 18:47:34 sfox Exp $ */ +/* $Id: override.php,v 1.35 2008/01/22 20:43:06 sfox Exp $ */ class Overrides { var $ignores = array(); @@ -60,10 +60,9 @@ private function _set_file_version($file_name, $gtkversion) { - while (substr($gtkversion, 2) > 6) { + while (version_compare($gtkversion, '2.6', '>')) { $split = explode('.', $file_name); - $point = substr($gtkversion, 2); $try = $split[0].'-'.$gtkversion.'.'.$split[1]; if (file_exists($try)) { @@ -71,6 +70,7 @@ break; } + $point = substr($gtkversion, 2); $gtkversion = '2.'.($point - 2); $this->_set_file_version($file_name, $gtkversion); } http://cvs.php.net/viewvc.cgi/php-gtk/generator/scheme.php?r1=1.31&r2=1.32&diff_format=u Index: php-gtk/generator/scheme.php diff -u php-gtk/generator/scheme.php:1.31 php-gtk/generator/scheme.php:1.32 --- php-gtk/generator/scheme.php:1.31 Tue Jan 22 18:47:34 2008 +++ php-gtk/generator/scheme.php Tue Jan 22 20:43:06 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: scheme.php,v 1.31 2008/01/22 18:47:34 sfox Exp $ */ +/* $Id: scheme.php,v 1.32 2008/01/22 20:43:06 sfox Exp $ */ require "definitions.php"; @@ -122,8 +122,8 @@ switch (gettype($arg)) { case 'string': - $this->file_name = $arg; $this->file_path = dirname($arg); + $this->_set_file_version($arg, $this->gtkversion); $this->_parse_or_load(); break; @@ -137,6 +137,25 @@ } } + private function _set_file_version($file_name, $gtkversion) + { + while (version_compare($gtkversion, '2.6', '>')) { + + $split = explode('.', $file_name); + $try = $split[0].'-'.$gtkversion.'.'.$split[1]; + + if (file_exists($try)) { + $file_name = $try; + break; + } + + $point = substr($gtkversion, 2); + $gtkversion = '2.'.($point - 2); + $this->_set_file_version($file_name, $gtkversion); + } + $this->file_name = $file_name; + } + private function _parse_or_load() { $cache_file = $this->file_name.'.cache'; @@ -422,17 +441,9 @@ function handle_include($arg) { $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}"); - } - else - { - error_log("Parsing file '$include_file'."); - $include_tree = parse($include_file, 'r'); - $this->start_parsing($include_tree); - } + error_log("Parsing file '$include_file'."); + $include_tree = parse($include_file, 'r'); + $this->start_parsing($include_tree); } function handle_define_virtual($arg)