com php/gtk-src: Generator fix, round 2: ext/extra/Makefile.frag ext/extra/config.w32 ext/gtk+/Makefile.frag ext/html/Makefile.frag ext/html/config.w32 ext/libglade/Makefile.frag ext/libsexy/Makefile.frag ext/skeleton/Makefile.frag ext/sourceview/Makefile.frag generator/reflection_class_checker.php

Commit:    2f32450597c01270a28a01d1159b51c958ed4e48=0AAuthor:    Patrick D.=
 Andersen <[email protected]>         Mon, 23 Jun 2014 10=
:07:54 -0400=0AParents:   9251177c138e5be7e3c33f689eb08d639da62cb8=0ABranch=
es:  master=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dco=
mmitdiff;h=3D2f32450597c01270a28a01d1159b51c958ed4e48=0A=0ALog:=0AGenerator=
 fix, round 2=0A=0ARemoved remaining references to generator.php (excluding=
 changelog and=0Amozembed)=0A=0AChanged paths:=0A  M  ext/extra/Makefile.fr=
ag=0A  M  ext/extra/config.w32=0A  M  ext/gtk+/Makefile.frag=0A  M  ext/htm=
l/Makefile.frag=0A  M  ext/html/config.w32=0A  M  ext/libglade/Makefile.fra=
g=0A  M  ext/libsexy/Makefile.frag=0A  M  ext/skeleton/Makefile.frag=0A  M =
 ext/sourceview/Makefile.frag=0A  M  generator/reflection_class_checker.php=
=0A=0A=0ADiff:=0Adiff --git a/ext/extra/Makefile.frag b/ext/extra/Makefile.=
frag=0Aindex a19e3f6..b0558ce 100644=0A--- a/ext/extra/Makefile.frag=0A+++ =
b/ext/extra/Makefile.frag=0A@@ -1,7 +1,7 @@=0A =0A $(builddir)/gen_gtkextra=
.c: $(srcdir)/gtkextra.defs $(srcdir)/gtkextra.overrides=0A =09( \=0A-     =
$(PHP) $(top_srcdir)/generator/generator.php \=0A+     $(PHP) $(top_srcdir)=
/generator/gtkgenerator.php \=0A =09 =09-l $(@D)/$(*F).log \=0A         -r =
ext/gtk+/atk-types.defs   \=0A         -r ext/gtk+/pango-types.defs \=0Adif=
f --git a/ext/extra/config.w32 b/ext/extra/config.w32=0Aindex 92c811f..4c34=
dd2 100644=0A--- a/ext/extra/config.w32=0A+++ b/ext/extra/config.w32=0A@@ -=
7,7 +7,7 @@ if (PHP_GTK_EXTRA !=3D "no" || PHP_GTK_ALL !=3D "no") {=0A =09=
=09if (FSO.FileExists("win32\\temp.bat")) {=0A =0A =09=09=09var temp =3D FS=
O.OpenTextFile("win32\\temp.bat", 8);=0A-=09=09=09temp.WriteLine("php -q ge=
nerator\\generator.php -l win32\\logs\\config_extra.log -o ext\\extra\\gtke=
xtra.overrides -p gtkextra -r ext\\gtk+\\gtk.defs ext\\extra\\gtkextra.defs=
 > ext\\extra\\gen_gtkextra.c");=0A+=09=09=09temp.WriteLine("php -q generat=
or\\gtkgenerator.php -l win32\\logs\\config_extra.log -o ext\\extra\\gtkext=
ra.overrides -p gtkextra -r ext\\gtk+\\gtk.defs ext\\extra\\gtkextra.defs >=
 ext\\extra\\gen_gtkextra.c");=0A                   temp.WriteLine('grep -h=
 "^PHP_GTK_EXPORT_CE" ext\\extra\\gen_gtkextra.c | sed -e "s/^/PHP_GTK_API =
extern /" > ext\\extra\\gen_gtkextra.h');=09=09=0A =09=09=09temp.Close();=
=0A =09=09}=0Adiff --git a/ext/gtk+/Makefile.frag b/ext/gtk+/Makefile.frag=
=0Aindex cfa08c7..7300456 100644=0A--- a/ext/gtk+/Makefile.frag=0A+++ b/ext=
/gtk+/Makefile.frag=0A@@ -19,7 +19,7 @@ $(builddir)/gen_pango.c: $(COMMONDE=
FS) $(srcdir)/pango.overrides=0A =0A gen_%.c : %.defs=0A =09( \=0A-     $(P=
HP) $(top_srcdir)/generator/generator.php \=0A+     $(PHP) $(top_srcdir)/ge=
nerator/gtkgenerator.php \=0A =09 =09-l $(@D)/gen_$(*F).log \=0A         -r=
 ext/gtk+/atk-types.defs   \=0A         -r ext/gtk+/pango-types.defs \=0Adi=
ff --git a/ext/html/Makefile.frag b/ext/html/Makefile.frag=0Aindex 288c3ef.=
.9e58255 100644=0A--- a/ext/html/Makefile.frag=0A+++ b/ext/html/Makefile.fr=
ag=0A@@ -1,7 +1,7 @@=0A =0A $(builddir)/gen_html.c: $(srcdir)/html.defs $(s=
rcdir)/html.overrides=0A =09( \=0A-     $(PHP) $(top_srcdir)/generator/gene=
rator.php \=0A+     $(PHP) $(top_srcdir)/generator/gtkgenerator.php \=0A =
=09 =09-l $(@D)/$(*F).log \=0A         -r ext/gtk+/atk-types.defs   \=0A   =
      -r ext/gtk+/pango-types.defs \=0Adiff --git a/ext/html/config.w32 b/e=
xt/html/config.w32=0Aindex 6b5479b..fe49a59 100644=0A--- a/ext/html/config.=
w32=0A+++ b/ext/html/config.w32=0A@@ -6,7 +6,7 @@ if (PHP_GTK_HTML !=3D "no=
" || PHP_GTK_ALL !=3D "no")=0A =09=09if (FSO.FileExists("win32\\temp.bat"))=
=0A =09=09{  =09=09=0A =09=09=09var temp =3D FSO.OpenTextFile("win32\\temp.=
bat", 8);=0A- =09=09=09temp.WriteLine("php -q generator\\generator.php -l w=
in32\\logs\\config_html.log -o ext\\html\\html.overrides -p gtkhtml -r ext\=
\gtk+\\gtk.defs ext\\html\\html.defs > ext\\html\\gen_html.c");=0A+ =09=09=
=09temp.WriteLine("php -q generator\\gtkgenerator.php -l win32\\logs\\confi=
g_html.log -o ext\\html\\html.overrides -p gtkhtml -r ext\\gtk+\\gtk.defs e=
xt\\html\\html.defs > ext\\html\\gen_html.c");=0A                   temp.Wr=
iteLine('grep -h "^PHP_GTK_EXPORT_CE" ext\\html\\gen_html.c | sed -e "s/^/P=
HP_GTK_API extern /" > ext\\html\\gen_html.h');=0A =09=09 =09temp.Close();=
=0A =09=09}=0A@@ -16,4 +16,4 @@ if (PHP_GTK_HTML !=3D "no" || PHP_GTK_ALL !=
=3D "no")=0A   =09} else {=0A   =09=09WARNING("gtkhtml3 not enabled; librar=
ies and headers not found");=0A  =09}=0A- } =0A\ No newline at end of file=
=0A+ } =0Adiff --git a/ext/libglade/Makefile.frag b/ext/libglade/Makefile.f=
rag=0Aindex 5b0c487..1123ab5 100644=0A--- a/ext/libglade/Makefile.frag=0A++=
+ b/ext/libglade/Makefile.frag=0A@@ -1,7 +1,7 @@=0A =0A $(builddir)/gen_lib=
glade.c: $(srcdir)/libglade.defs $(srcdir)/libglade.overrides=0A =09( \=0A-=
     $(PHP) $(top_srcdir)/generator/generator.php \=0A+     $(PHP) $(top_sr=
cdir)/generator/gtkgenerator.php \=0A =09 =09-l $(@D)/$(*F).log \=0A       =
  -r ext/gtk+/atk-types.defs   \=0A         -r ext/gtk+/pango-types.defs \=
=0Adiff --git a/ext/libsexy/Makefile.frag b/ext/libsexy/Makefile.frag=0Aind=
ex fbef5f1..b896ccc 100644=0A--- a/ext/libsexy/Makefile.frag=0A+++ b/ext/li=
bsexy/Makefile.frag=0A@@ -1,7 +1,7 @@=0A =0A $(builddir)/gen_libsexy.c: $(s=
rcdir)/sexy.defs $(srcdir)/sexy.overrides=0A =09( \=0A-     $(PHP) $(top_sr=
cdir)/generator/generator.php \=0A+     $(PHP) $(top_srcdir)/generator/gtkg=
enerator.php \=0A =09 =09-l $(@D)/$(*F).log \=0A         -r ext/gtk+/atk-ty=
pes.defs   \=0A         -r ext/gtk+/pango-types.defs \=0Adiff --git a/ext/s=
keleton/Makefile.frag b/ext/skeleton/Makefile.frag=0Aindex c6ba9ff..5280a94=
 100644=0A--- a/ext/skeleton/Makefile.frag=0A+++ b/ext/skeleton/Makefile.fr=
ag=0A@@ -4,7 +4,7 @@ $(builddir)/php_skeleton.lo: $(builddir)/gen_ce_skelet=
on.h=0A $(builddir)/gen_skeleton.lo: $(builddir)/gen_skeleton.c=0A =0A $(bu=
ilddir)/gen_skeleton.c: $(srcdir)/skeleton.defs $(srcdir)/skeleton.override=
s=0A-=09$(PHP) -f $(top_srcdir)/generator/generator.php -- -o $(srcdir)/ske=
leton.overrides -p Skeleton -r $(top_srcdir)/ext/gtk%2b/gtk.defs $(srcdir)/=
skeleton.defs > $@=0A+=09$(PHP) -f $(top_srcdir)/generator/gtkgenerator.php=
 -- -o $(srcdir)/skeleton.overrides -p Skeleton -r $(top_srcdir)/ext/gtk%2b=
/gtk.defs $(srcdir)/skeleton.defs > $@=0A =0A $(builddir)/gen_ce_skeleton.h=
: $(builddir)/gen_skeleton.c=0A =09grep -h "^PHP_GTK_EXPORT_CE" $(srcdir)/g=
en_skeleton.c | sed -e "s!^!extern !" > $@=0Adiff --git a/ext/sourceview/Ma=
kefile.frag b/ext/sourceview/Makefile.frag=0Aindex 945d378..78658da 100644=
=0A--- a/ext/sourceview/Makefile.frag=0A+++ b/ext/sourceview/Makefile.frag=
=0A@@ -1,7 +1,7 @@=0A =0A $(builddir)/gen_sourceview.c: $(srcdir)/sourcevie=
w.defs $(srcdir)/sourceview.overrides=0A =09( \=0A-     $(PHP) $(top_srcdir=
)/generator/generator.php \=0A+     $(PHP) $(top_srcdir)/generator/gtkgener=
ator.php \=0A =09 =09-l $(@D)/$(*F).log \=0A         -r ext/gtk+/atk-types.=
defs   \=0A         -r ext/gtk+/pango-types.defs \=0Adiff --git a/generator=
/reflection_class_checker.php b/generator/reflection_class_checker.php=0Ain=
dex 9a16c8b..b143c1a 100644=0A--- a/generator/reflection_class_checker.php=
=0A+++ b/generator/reflection_class_checker.php=0A@@ -6,7 +6,7 @@=0A * here=
 we check that=0A * =0A * The classes spit out by this script have to be en=
tered in =0A-*  generator.php function is_in_php()=0A+*  gtkgenerator.php f=
unction is_in_php()=0A */=0A =0A $arFiles =3D array(=0A