Re: Fw: [php-gtk-cvs] cvs: php-gtk /ext/libglade Makefile.frag php_libglade.h

Yes, I know it's going back to the circular route - but doing it any other way breaks the win32 build, which until now has worked fine (and is exactly the same way as it worked in PHP-GTK 1). I did say I'd revert this if it broke *nix builds - does it? ----- Original Message ----- From: "Andrei Zmievski" <andrei@gravitonic.com> To: "Steph" <steph@zend.com> Cc: "PHP-GTK dev" <php-gtk-dev@lists.php.net> Sent: Tuesday, October 11, 2005 5:27 PM Subject: Re: [PHP-GTK-DEV] Fw: [php-gtk-cvs] cvs: php-gtk /ext/libglade Makefile.frag php_libglade.h > You know, it would help if you attached your diff to this message. > Really. We don't want to include php_gtk_api.h from gtk.overrides, > because that *is* part of the API. > > -Andrei > > On Oct 11, 2005, at 4:56 AM, Steph wrote: > > > OK, I found the breakage now, tho' I'm still confused as to why it > > didn't > > show up on my diffs. > > > > The only way I can see to fix it without going back to where we were > > is by > > including php_gtk_api.h from gtk.overrides. > > > > Going to apply that mini-patch, will revert if it breaks anything on > > *nix. > > > > - Steph > > > > ----- Original Message ----- > > From: "Andrei Zmievski" <andrei@php.net> > > To: <php-gtk-cvs@lists.php.net> > > Sent: Sunday, October 09, 2005 6:53 PM > > Subject: [php-gtk-cvs] cvs: php-gtk /ext/libglade Makefile.frag > > php_libglade.h > > > > > >> andrei Sun Oct 9 13:53:12 2005 EDT > >> > >> Modified files: > >> /php-gtk/ext/libglade Makefile.frag php_libglade.h > >> Log: > >> - Don't include gen_libglade.h from php_libglade.h > >> - Adjust make files to remove extra gen_ prefix > >> > >> > >> > > > > http://cvs.php.net/diff.php/php-gtk/ext/libglade/Makefile.frag? > > r1=1.3&r2=1.4&ty=u > >> Index: php-gtk/ext/libglade/Makefile.frag > >> diff -u php-gtk/ext/libglade/Makefile.frag:1.3 > > php-gtk/ext/libglade/Makefile.frag:1.4 > >> --- php-gtk/ext/libglade/Makefile.frag:1.3 Thu Oct 6 03:03:13 2005 > >> +++ php-gtk/ext/libglade/Makefile.frag Sun Oct 9 13:53:10 2005 > >> @@ -2,7 +2,7 @@ > >> $(builddir)/gen_libglade.c: $(srcdir)/libglade.defs > > $(srcdir)/libglade.overrides > >> ( \ > >> $(PHP) $(top_srcdir)/generator/generator.php \ > >> - -l $(@D)/gen_$(*F).log \ > >> + -l $(@D)/$(*F).log \ > >> -r ext/gtk+/atk-types.defs \ > >> -r ext/gtk+/pango-types.defs \ > >> -r ext/gtk+/gdk-types.defs \ > >> @@ -10,5 +10,5 @@ > >> -o ext/libglade/libglade.overrides \ > >> -p Glade \ > >> -f $@ ext/libglade/libglade.defs \ > >> - && grep -h "^PHP_GTK_EXPORT_CE" $@ | sed -e "s!^!extern > >> !" > > > $(@D)/gen_$(*F).h \ > >> + && grep -h "^PHP_GTK_EXPORT_CE" $@ | sed -e "s!^!extern > >> !" > > > $(@D)/$(*F).h \ > >> ) > >> > > > > http://cvs.php.net/diff.php/php-gtk/ext/libglade/php_libglade.h? > > r1=1.9&r2=1.10&ty=u > >> Index: php-gtk/ext/libglade/php_libglade.h > >> diff -u php-gtk/ext/libglade/php_libglade.h:1.9 > > php-gtk/ext/libglade/php_libglade.h:1.10 > >> --- php-gtk/ext/libglade/php_libglade.h:1.9 Sun Oct 2 18:58:26 2005 > >> +++ php-gtk/ext/libglade/php_libglade.h Sun Oct 9 13:53:10 2005 > >> @@ -18,7 +18,7 @@ > >> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA > >> 02111-1307 > > USA > >> */ > >> > >> -/* $Id: php_libglade.h,v 1.9 2005/10/02 22:58:26 sfox Exp $: */ > >> +/* $Id: php_libglade.h,v 1.10 2005/10/09 17:53:10 andrei Exp $: */ > >> > >> #ifndef PHP_LIBGLADE_H > >> #define PHP_LIBGLADE_H > >> @@ -28,7 +28,6 @@ > >> #if HAVE_LIBGLADE > >> > >> #include <glade/glade.h> > >> -#include "gen_libglade.h" > >> > >> extern php_gtk_ext_entry libglade_ext_entry; > >> #define php_gtk_ext_libglade_ptr &libglade_ext_entry > >> > >> -- > >> PHP-GTK CVS Mailing List (http://gtk.php.net/) > >> To unsubscribe, visit: http://www.php.net/unsub.php > >> > > > > -- > > PHP-GTK Development Mailing List (http://gtk.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php >