'[php-gtk-cvs] cvs: php-gtk / php_gtk.m4 /ext/gtk+ Makefile.frag gtk.overrides php_gtk+.c /generato'

[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 gtk.overrides php_gtk+.c  /generato
From:       "Andrei Zmievski" <andrei () php ! net>
Date:       2004-08-14 5:28:51
Message-ID: cvsandrei1092461331 () cvsserver
[Download RAW message or body]

andrei		Sat Aug 14 01:28:51 2004 EDT

  Modified files:              
    /php-gtk	php_gtk.m4 
    /php-gtk/ext/gtk+	Makefile.frag gtk.overrides php_gtk+.c 
    /php-gtk/generator	templates.php 
  Log:
  * Fix "underquoted definition" warnings in php_gtk.m4.
  * Add atk*.defs to the mix.
  * Simplify building even more via implicit rules: gen_*.h is now
    generated right after gen_*.c. Thus, adding 'atk' definitions was a
    snap.
  
  # Damn, it pays to learn GNU make rules.
  
  
http://cvs.php.net/diff.php/php-gtk/php_gtk.m4?r1=1.15&r2=1.16&ty=u
Index: php-gtk/php_gtk.m4
diff -u php-gtk/php_gtk.m4:1.15 php-gtk/php_gtk.m4:1.16
--- php-gtk/php_gtk.m4:1.15	Sat Aug 14 00:46:56 2004
+++ php-gtk/php_gtk.m4	Sat Aug 14 01:28:50 2004
@@ -7,7 +7,7 @@
 dnl
 dnl "extname" is the name of the ext/ subdir where the extension resides
 dnl
-AC_DEFUN(PHP_GTK_EXTENSION,[
+AC_DEFUN([PHP_GTK_EXTENSION],[
   ext_builddir=[]PHP_EXT_BUILDDIR($1)
   ext_srcdir=[]PHP_EXT_SRCDIR($1)
   php_gtk_ext_builddir=$ext_builddir/ext/$1
@@ -41,7 +41,7 @@
 PHP_SUBST(PHP_GTK_EXTENSIONS)
 
 
-AC_DEFUN(PHP_GTK_ARG_ANALYZE,[
+AC_DEFUN([PHP_GTK_ARG_ANALYZE],[
 case [$]$1 in
 shared,*)
   php_gtk_ext_output="yes, shared"
@@ -72,11 +72,11 @@
 dnl default-val defaults to no.  This will also set the variable
 dnl php_gtk_ext_shared, and will overwrite any previous variable of that name.
 dnl
-AC_DEFUN(PHP_GTK_ARG_ENABLE,[
+AC_DEFUN([PHP_GTK_ARG_ENABLE],[
 PHP_GTK_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_GTK_[]translit($1,a-z-,A-Z_))
 ])
 
-AC_DEFUN(PHP_GTK_REAL_ARG_ENABLE,[
+AC_DEFUN([PHP_GTK_REAL_ARG_ENABLE],[
 AC_MSG_CHECKING($2)
 AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4))
 PHP_GTK_ARG_ANALYZE($5)
@@ -88,18 +88,18 @@
 dnl default-val defaults to no.  This will also set the variable
 dnl php_gtk_ext_shared, and will overwrite any previous variable of that name.
 dnl
-AC_DEFUN(PHP_GTK_ARG_WITH,[
+AC_DEFUN([PHP_GTK_ARG_WITH],[
 PHP_GTK_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_GTK_[]translit($1,a-z0-9-,A-Z0-9_))
 ])
 
-AC_DEFUN(PHP_GTK_REAL_ARG_WITH,[
+AC_DEFUN([PHP_GTK_REAL_ARG_WITH],[
 AC_MSG_CHECKING([$2])
 AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4))
 PHP_GTK_ARG_ANALYZE($5)
 ])
 
 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_atk.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.3&r2=1.4&ty=u
Index: php-gtk/ext/gtk+/Makefile.frag
diff -u php-gtk/ext/gtk+/Makefile.frag:1.3 php-gtk/ext/gtk+/Makefile.frag:1.4
--- php-gtk/ext/gtk+/Makefile.frag:1.3	Sat Aug 14 00:46:56 2004
+++ php-gtk/ext/gtk+/Makefile.frag	Sat Aug 14 01:28:51 2004
@@ -8,17 +8,24 @@
 #	$(PHP) -f $(top_srcdir)/generator/generator.php -- -o ext/gtk%2b/gdk.overrides -p \
Gdk ext/gtk%2b/gdk.defs > $(srcdir)/gen_gdk.c  #
 #$(srcdir)/gen_gtk.h: $(srcdir)/gen_gtk.c $(srcdir)/gen_gdk.c
-$(srcdir)/gen_gtk.h: $(srcdir)/gen_gtk.c 
+#$(srcdir)/gen_gtk.h: $(srcdir)/gen_gtk.c 
 #	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_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 +COMMONDEFS=$(srcdir)/gtk-types.defs $(srcdir)/gdk-types.defs \
\ +		   $(srcdir)/atk-types.defs #$(srcdir)/pango-types.defs
+
+$(srcdir)/gen_gtk.c: $(srcdir)/gtk.defs $(COMMONDEFS) $(srcdir)/gtk-extrafuncs.defs \
$(srcdir)/gtk.overrides +$(srcdir)/gen_atk.c: $(COMMONDEFS) $(srcdir)/atk.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) > $@
+	( \
+	 cd ext/gtk+ \
+     && $(PHP) $(top_srcdir)/generator/generator.php \
+        -r atk-types.defs \
+        -r gtk-types.defs \
+        -o $(*F).overrides \
+        -p $(*F) $(*F).defs > $(@F)  \
+     && grep -h "^PHP_GTK_EXPORT_CE" $(@F) | sed -e "s!^!extern !" > gen_$(*F).h \
+	)
http://cvs.php.net/diff.php/php-gtk/ext/gtk+/gtk.overrides?r1=1.68&r2=1.69&ty=u
Index: php-gtk/ext/gtk+/gtk.overrides
diff -u php-gtk/ext/gtk+/gtk.overrides:1.68 php-gtk/ext/gtk+/gtk.overrides:1.69
--- php-gtk/ext/gtk+/gtk.overrides:1.68	Thu Oct  9 23:41:37 2003
+++ php-gtk/ext/gtk+/gtk.overrides	Sat Aug 14 01:28:51 2004
@@ -1,6 +1,7 @@
 /* vim: set ft=cpp fdm=marker: */
 %%
 headers
+#include "gen_atk.h"
 #include "ext/standard/file.h"
 
 %% {{{ ignores
http://cvs.php.net/diff.php/php-gtk/ext/gtk+/php_gtk+.c?r1=1.16&r2=1.17&ty=u
Index: php-gtk/ext/gtk+/php_gtk+.c
diff -u php-gtk/ext/gtk+/php_gtk+.c:1.16 php-gtk/ext/gtk+/php_gtk+.c:1.17
--- php-gtk/ext/gtk+/php_gtk+.c:1.16	Thu Aug 12 03:26:14 2004
+++ php-gtk/ext/gtk+/php_gtk+.c	Sat Aug 14 01:28:51 2004
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_gtk+.c,v 1.16 2004/08/12 07:26:14 andrei Exp $: */
+/* $Id: php_gtk+.c,v 1.17 2004/08/14 05:28:51 andrei Exp $: */
 
 #include "php_gtk.h"
 #include "SAPI.h"
@@ -166,7 +166,8 @@
 	//php_gtk_register_constants(module_number TSRMLS_CC);
 	//php_gdk_register_constants(module_number TSRMLS_CC);
 	//php_gdk_register_keysyms(module_number TSRMLS_CC);
-	php_gtk_register_classes();
+	phpg_gtk_register_classes();
+	phpg_atk_register_classes();
 	//php_gdk_register_classes();
 	//php_gtk_plus_register_types(module_number);
 
http://cvs.php.net/diff.php/php-gtk/generator/templates.php?r1=1.24&r2=1.25&ty=u
Index: php-gtk/generator/templates.php
diff -u php-gtk/generator/templates.php:1.24 php-gtk/generator/templates.php:1.25
--- php-gtk/generator/templates.php:1.24	Fri Aug 13 02:33:42 2004
+++ php-gtk/generator/templates.php	Sat Aug 14 01:28:51 2004
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: templates.php,v 1.24 2004/08/13 06:33:42 andrei Exp $ */
+/* $Id: templates.php,v 1.25 2004/08/14 05:28:51 andrei Exp $ */
 
 $function_tpl = "
 PHP_FUNCTION(%s)
@@ -110,7 +110,7 @@
 }\n\n";
 
 $register_classes_tpl = "
-void php_%s_register_classes(void)
+void phpg_%s_register_classes(void)
 {
 	TSRMLS_FETCH();
 %s

-- 
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]
Configure | About | News | Add a list | Sponsored by KoreLogic