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 Author: Patrick D. Andersen <pdandersen@makoto-ub.scooby.doobies> Mon, 23 Jun 2014 10:07:54 -0400 Parents: 9251177c138e5be7e3c33f689eb08d639da62cb8 Branches: master Link: http://git.php.net/?p=php/gtk-src.git;a=commitdiff;h=2f32450597c01270a28a01d1159b51c958ed4e48 Log: Generator fix, round 2 Removed remaining references to generator.php (excluding changelog and mozembed) Changed paths: M ext/extra/Makefile.frag M ext/extra/config.w32 M ext/gtk+/Makefile.frag M ext/html/Makefile.frag M ext/html/config.w32 M ext/libglade/Makefile.frag M ext/libsexy/Makefile.frag M ext/skeleton/Makefile.frag M ext/sourceview/Makefile.frag M generator/reflection_class_checker.php Diff: diff --git a/ext/extra/Makefile.frag b/ext/extra/Makefile.frag index a19e3f6..b0558ce 100644 --- a/ext/extra/Makefile.frag +++ b/ext/extra/Makefile.frag @@ -1,7 +1,7 @@ $(builddir)/gen_gtkextra..c: $(srcdir)/gtkextra.defs $(srcdir)/gtkextra.overrides ( \ - $(PHP) $(top_srcdir)/generator/generator.php \ + $(PHP) $(top_srcdir)/generator/gtkgenerator.php \ -l $(@D)/$(*F).log \ -r ext/gtk+/atk-types.defs \ -r ext/gtk+/pango-types.defs \ diff --git a/ext/extra/config.w32 b/ext/extra/config.w32 index 92c811f..4c34dd2 100644 --- a/ext/extra/config.w32 +++ b/ext/extra/config.w32 @@ -7,7 +7,7 @@ if (PHP_GTK_EXTRA != "no" || PHP_GTK_ALL != "no") { if (FSO.FileExists("win32\\temp.bat")) { var temp = FSO.OpenTextFile("win32\\temp.bat", 8); - temp.WriteLine("php -q generator\\generator.php -l win32\\logs\\config_extra.log -o ext\\extra\\gtkextra.overrides -p gtkextra -r ext\\gtk+\\gtk.defs ext\\extra\\gtkextra.defs > ext\\extra\\gen_gtkextra.c"); + temp.WriteLine("php -q generator\\gtkgenerator.php -l win32\\logs\\config_extra.log -o ext\\extra\\gtkextra.overrides -p gtkextra -r ext\\gtk+\\gtk.defs ext\\extra\\gtkextra.defs > ext\\extra\\gen_gtkextra.c"); 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'); temp.Close(); } diff --git a/ext/gtk+/Makefile.frag b/ext/gtk+/Makefile.frag index cfa08c7..7300456 100644 --- a/ext/gtk+/Makefile.frag +++ b/ext/gtk+/Makefile.frag @@ -19,7 +19,7 @@ $(builddir)/gen_pango.c: $(COMMONDEFS) $(srcdir)/pango.overrides gen_%.c : %.defs ( \ - $(PHP) $(top_srcdir)/generator/generator.php \ + $(PHP) $(top_srcdir)/generator/gtkgenerator.php \ -l $(@D)/gen_$(*F).log \ -r ext/gtk+/atk-types.defs \ -r ext/gtk+/pango-types.defs \ diff --git a/ext/html/Makefile.frag b/ext/html/Makefile.frag index 288c3ef...9e58255 100644 --- a/ext/html/Makefile.frag +++ b/ext/html/Makefile.frag @@ -1,7 +1,7 @@ $(builddir)/gen_html.c: $(srcdir)/html.defs $(srcdir)/html.overrides ( \ - $(PHP) $(top_srcdir)/generator/generator.php \ + $(PHP) $(top_srcdir)/generator/gtkgenerator.php \ -l $(@D)/$(*F).log \ -r ext/gtk+/atk-types.defs \ -r ext/gtk+/pango-types.defs \ diff --git a/ext/html/config.w32 b/ext/html/config.w32 index 6b5479b..fe49a59 100644 --- a/ext/html/config.w32 +++ b/ext/html/config.w32 @@ -6,7 +6,7 @@ if (PHP_GTK_HTML != "no" || PHP_GTK_ALL != "no") if (FSO.FileExists("win32\\temp.bat")) { var temp = FSO.OpenTextFile("win32\\temp.bat", 8); - temp.WriteLine("php -q generator\\generator.php -l win32\\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"); + temp.WriteLine("php -q generator\\gtkgenerator.php -l win32\\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"); temp.WriteLine('grep -h "^PHP_GTK_EXPORT_CE" ext\\html\\gen_html.c | sed -e "s/^/PHP_GTK_API extern /" > ext\\html\\gen_html.h'); temp.Close(); } @@ -16,4 +16,4 @@ if (PHP_GTK_HTML != "no" || PHP_GTK_ALL != "no") } else { WARNING("gtkhtml3 not enabled; libraries and headers not found"); } - } \ No newline at end of file + } diff --git a/ext/libglade/Makefile.frag b/ext/libglade/Makefile.frag index 5b0c487..1123ab5 100644 --- a/ext/libglade/Makefile.frag +++ b/ext/libglade/Makefile.frag @@ -1,7 +1,7 @@ $(builddir)/gen_libglade.c: $(srcdir)/libglade.defs $(srcdir)/libglade.overrides ( \ - $(PHP) $(top_srcdir)/generator/generator.php \ + $(PHP) $(top_srcdir)/generator/gtkgenerator.php \ -l $(@D)/$(*F).log \ -r ext/gtk+/atk-types.defs \ -r ext/gtk+/pango-types.defs \ diff --git a/ext/libsexy/Makefile.frag b/ext/libsexy/Makefile.frag index fbef5f1..b896ccc 100644 --- a/ext/libsexy/Makefile.frag +++ b/ext/libsexy/Makefile.frag @@ -1,7 +1,7 @@ $(builddir)/gen_libsexy.c: $(srcdir)/sexy.defs $(srcdir)/sexy.overrides ( \ - $(PHP) $(top_srcdir)/generator/generator.php \ + $(PHP) $(top_srcdir)/generator/gtkgenerator.php \ -l $(@D)/$(*F).log \ -r ext/gtk+/atk-types.defs \ -r ext/gtk+/pango-types.defs \ diff --git a/ext/skeleton/Makefile.frag b/ext/skeleton/Makefile.frag index c6ba9ff..5280a94 100644 --- a/ext/skeleton/Makefile.frag +++ b/ext/skeleton/Makefile.frag @@ -4,7 +4,7 @@ $(builddir)/php_skeleton.lo: $(builddir)/gen_ce_skeleton.h $(builddir)/gen_skeleton.lo: $(builddir)/gen_skeleton.c $(builddir)/gen_skeleton.c: $(srcdir)/skeleton.defs $(srcdir)/skeleton.overrides - $(PHP) -f $(top_srcdir)/generator/generator.php -- -o $(srcdir)/skeleton.overrides -p Skeleton -r $(top_srcdir)/ext/gtk%2b/gtk.defs $(srcdir)/skeleton.defs > $@ + $(PHP) -f $(top_srcdir)/generator/gtkgenerator.php -- -o $(srcdir)/skeleton.overrides -p Skeleton -r $(top_srcdir)/ext/gtk%2b/gtk.defs $(srcdir)/skeleton.defs > $@ $(builddir)/gen_ce_skeleton.h: $(builddir)/gen_skeleton.c grep -h "^PHP_GTK_EXPORT_CE" $(srcdir)/gen_skeleton.c | sed -e "s!^!extern !" > $@ diff --git a/ext/sourceview/Makefile.frag b/ext/sourceview/Makefile.frag index 945d378..78658da 100644 --- a/ext/sourceview/Makefile.frag +++ b/ext/sourceview/Makefile.frag @@ -1,7 +1,7 @@ $(builddir)/gen_sourceview.c: $(srcdir)/sourceview.defs $(srcdir)/sourceview.overrides ( \ - $(PHP) $(top_srcdir)/generator/generator.php \ + $(PHP) $(top_srcdir)/generator/gtkgenerator.php \ -l $(@D)/$(*F).log \ -r ext/gtk+/atk-types.defs \ -r ext/gtk+/pango-types.defs \ diff --git a/generator/reflection_class_checker.php b/generator/reflection_class_checker.php index 9a16c8b..b143c1a 100644 --- a/generator/reflection_class_checker.php +++ b/generator/reflection_class_checker.php @@ -6,7 +6,7 @@ * here we check that * * The classes spit out by this script have to be entered in -* generator.php function is_in_php() +* gtkgenerator.php function is_in_php() */ $arFiles = array(