Skip to content
This repository has been archived by the owner on Dec 8, 2021. It is now read-only.

Commit

Permalink
Additional changes for generator.php => gtkgenerator.php rename
Browse files Browse the repository at this point in the history
  • Loading branch information
auroraeosrose committed Jun 23, 2014
2 parents e29ec51 + 2f32450 commit c1bf7a3
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion 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 \
Expand Down
2 changes: 1 addition & 1 deletion ext/extra/config.w32
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ext/gtk+/Makefile.frag
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 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 \
Expand Down
4 changes: 2 additions & 2 deletions ext/html/config.w32
Expand Up @@ -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();
}
Expand All @@ -16,4 +16,4 @@ if (PHP_GTK_HTML != "no" || PHP_GTK_ALL != "no")
} else {
WARNING("gtkhtml3 not enabled; libraries and headers not found");
}
}
}
2 changes: 1 addition & 1 deletion 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 \
Expand Down
2 changes: 1 addition & 1 deletion 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 \
Expand Down
2 changes: 1 addition & 1 deletion ext/skeleton/Makefile.frag
Expand Up @@ -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 !" > $@
Expand Down
2 changes: 1 addition & 1 deletion 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 \
Expand Down
2 changes: 1 addition & 1 deletion generator/reflection_class_checker.php
Expand Up @@ -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(
Expand Down

0 comments on commit c1bf7a3

Please sign in to comment.