[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-gtk-cvs
Subject:    [php-gtk-cvs] cvs: php-gtk / php_gtk.m4  /ext/gtk+ Makefile.frag  /generator generator.php
From:       "Andrei Zmievski" <andrei () php ! net>
Date:       2004-08-14 4:46:57
Message-ID: cvsandrei1092458817 () cvsserver
[Download RAW message or body]

andrei		Sat Aug 14 00:46:57 2004 EDT

  Modified files:              
    /php-gtk	php_gtk.m4 
    /php-gtk/ext/gtk+	Makefile.frag 
    /php-gtk/generator	generator.php 
  Log:
  Fix build and optimize .defs -> .c conversion.
  
  
http://cvs.php.net/diff.php/php-gtk/php_gtk.m4?r1=1.14&r2=1.15&ty=u
Index: php-gtk/php_gtk.m4
diff -u php-gtk/php_gtk.m4:1.14 php-gtk/php_gtk.m4:1.15
--- php-gtk/php_gtk.m4:1.14	Thu Aug 12 03:26:06 2004
+++ php-gtk/php_gtk.m4	Sat Aug 14 00:46:56 2004
@@ -99,7 +99,7 @@
 ])
 
 dnl PHP_GTK_EXTENSION(gtk+, no, php_gtk+.c php_gdk.c php_gtk+_types.c, gen_gtk.c \
                gen_gdk.c)
-PHP_GTK_EXTENSION(gtk+, no, php_gtk+.c gen_gtk.c)
+PHP_GTK_EXTENSION(gtk+, no, php_gtk+.c, gen_gtk.c)
 PHP_NEW_EXTENSION(php_gtk, main/php_gtk.c main/phpg_gtype.c main/phpg_exceptions.c \
main/php_gtk_util.c main/phpg_gvalue.c main/phpg_gobject.c, $ext_shared,, \
-I@ext_srcdir@/main)  
 dnl reading config stubs
http://cvs.php.net/diff.php/php-gtk/ext/gtk+/Makefile.frag?r1=1.2&r2=1.3&ty=u
Index: php-gtk/ext/gtk+/Makefile.frag
diff -u php-gtk/ext/gtk+/Makefile.frag:1.2 php-gtk/ext/gtk+/Makefile.frag:1.3
--- php-gtk/ext/gtk+/Makefile.frag:1.2	Thu Aug 12 03:26:06 2004
+++ php-gtk/ext/gtk+/Makefile.frag	Sat Aug 14 00:46:56 2004
@@ -1,8 +1,8 @@
-$(builddir)/php_gtk+.o $(builddir)/php_gtk+.lo: $(srcdir)/gen_gtk.h
+#$(builddir)/php_gtk+.o $(builddir)/php_gtk+.lo: $(srcdir)/gen_gtk.h
 
-$(srcdir)/gen_gtk.c: $(srcdir)/gtk.defs $(srcdir)/gtk-extrafuncs.defs \
$(srcdir)/gtk.overrides +#$(srcdir)/gen_gtk.c: $(srcdir)/gtk.defs \
$(srcdir)/gtk-extrafuncs.defs $(srcdir)/gtk.overrides  #	$(PHP) -f \
$(top_srcdir)/generator/generator.php -- -o ext/gtk%2b/gtk.overrides -p Gtk -r \
                $(top_srcdir)/ext/gtk%2b/gdk.defs ext/gtk%2b/gtk.defs > \
                $(srcdir)/gen_gtk.c
-	$(PHP) -f $(top_srcdir)/generator/generator.php -- -o ext/gtk%2b/gtk.overrides -p \
Gtk ext/gtk%2b/gtk.defs > $(srcdir)/gen_gtk.c +# $(PHP) -f \
$(top_srcdir)/generator/generator.php -- -o ext/gtk%2b/gtk.overrides -p Gtk \
ext/gtk%2b/gtk.defs > $(srcdir)/gen_gtk.c  
 #$(srcdir)/gen_gdk.c: $(srcdir)/gdk.defs $(srcdir)/gdk.overrides
 #	$(PHP) -f $(top_srcdir)/generator/generator.php -- -o ext/gtk%2b/gdk.overrides -p \
Gdk ext/gtk%2b/gdk.defs > $(srcdir)/gen_gdk.c @@ -12,3 +12,13 @@
 #	grep -h "^PHP_GTK_EXPORT_CE" $(srcdir)/gen_gtk.c $(srcdir)/gen_gdk.c | sed -e \
"s!^!extern !" > $(srcdir)/gen_gtk.h  grep -h "^PHP_GTK_EXPORT_CE" \
$(srcdir)/gen_gtk.c | sed -e "s!^!extern !" > $(srcdir)/gen_gtk.h  #	grep -h \
"PHP_GTK_EXPORT_FUNC" $(srcdir)/gen_gtk.c $(srcdir)/gen_gdk.c | sed -e 's!$$!;!' >> \
$(srcdir)/gen_gtk.h +
+$(srcdir)/gen_gtk.c: $(srcdir)/gtk.defs $(srcdir)/gtk-extrafuncs.defs \
$(srcdir)/gtk.overrides +
+gen_%.c : %.defs
+	(cd ext/gtk+ \
+	 && $(PHP) $(top_srcdir)/generator/generator.php \
+		-r atk-types.defs \
+		-r gtk-types.defs \
+		-o $(*F).overrides \
+		-p $(*F) $(*F).defs) > $@
http://cvs.php.net/diff.php/php-gtk/generator/generator.php?r1=1.48&r2=1.49&ty=u
Index: php-gtk/generator/generator.php
diff -u php-gtk/generator/generator.php:1.48 php-gtk/generator/generator.php:1.49
--- php-gtk/generator/generator.php:1.48	Fri Aug 13 02:33:42 2004
+++ php-gtk/generator/generator.php	Sat Aug 14 00:46:57 2004
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: generator.php,v 1.48 2004/08/13 06:33:42 andrei Exp $ */
+/* $Id: generator.php,v 1.49 2004/08/14 04:46:57 andrei Exp $ */
 
 /*
  * Significant portions of this generator are based on the pygtk code generator
@@ -796,9 +796,6 @@
 
 $old_error_reporting = error_reporting(E_ALL & ~E_NOTICE);
 
-/* For backwards compatibility. */
-chdir(dirname(__FILE__));
-
 if (!isset($_SERVER['argv'])) 
     fatal_error("
         Could not read command line arguments for generator.php 
@@ -823,8 +820,6 @@
     fatal_error("usage: php -q generator.php [-o overridesfile] [-p prefix] [-c \
functionclass ] [-r typesfile] defsfile\n");  
 list($opts, $argv) = $result;
-
-chdir('..');
 
 $prefix = 'Gtk';
 $function_class = null;

-- 
PHP-GTK CVS Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]