diff --git a/ChangeLog b/ChangeLog index 4149b8eb4c..1411e256a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 21 18:42:51 2003 Owen Taylor + + * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: + Remove geninclude.pl from CVS and don't dist it either, + it is generated. (#108970, Rich Kinder) + Mon Apr 21 18:35:48 2003 Owen Taylor * gtk/gtkobject.h: Remove a couple of obsolete comments, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4149b8eb4c..1411e256a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Apr 21 18:42:51 2003 Owen Taylor + + * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: + Remove geninclude.pl from CVS and don't dist it either, + it is generated. (#108970, Rich Kinder) + Mon Apr 21 18:35:48 2003 Owen Taylor * gtk/gtkobject.h: Remove a couple of obsolete comments, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4149b8eb4c..1411e256a7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Apr 21 18:42:51 2003 Owen Taylor + + * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: + Remove geninclude.pl from CVS and don't dist it either, + it is generated. (#108970, Rich Kinder) + Mon Apr 21 18:35:48 2003 Owen Taylor * gtk/gtkobject.h: Remove a couple of obsolete comments, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4149b8eb4c..1411e256a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Apr 21 18:42:51 2003 Owen Taylor + + * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: + Remove geninclude.pl from CVS and don't dist it either, + it is generated. (#108970, Rich Kinder) + Mon Apr 21 18:35:48 2003 Owen Taylor * gtk/gtkobject.h: Remove a couple of obsolete comments, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4149b8eb4c..1411e256a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Apr 21 18:42:51 2003 Owen Taylor + + * demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl: + Remove geninclude.pl from CVS and don't dist it either, + it is generated. (#108970, Rich Kinder) + Mon Apr 21 18:35:48 2003 Owen Taylor * gtk/gtkobject.h: Remove a couple of obsolete comments, diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 9a492ccda9..0fac5d8219 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -52,7 +52,6 @@ bin_PROGRAMS = gtk-demo BUILT_SOURCES = demos.h EXTRA_DIST = \ - geninclude.pl \ $(IMAGEFILES) demos.h: $(demos) geninclude.pl diff --git a/demos/gtk-demo/geninclude.pl b/demos/gtk-demo/geninclude.pl deleted file mode 100755 index f5fcd3ff48..0000000000 --- a/demos/gtk-demo/geninclude.pl +++ /dev/null @@ -1,163 +0,0 @@ -#!/usr/bin/perl -w - -print <; - $title =~ s@^\s*/\*\s*@@; - $title =~ s@\s*$@@; - - close INFO_FILE; - - print "GtkWidget *do_$basename (void);\n"; - - push @demos, {"title" => $title, "file" => $file, - "func" => "do_$basename"}; -} - -# generate a list of 'parent names' -foreach $href (@demos) { - if ($href->{"title"} =~ m|^([\w\s]+)/[\w\s]+$|) { - my $parent_name = $1; - my $do_next = 0; - - # parent detected - if (defined @parents) { - foreach $foo (@parents) { - if ($foo eq $parent_name) { - $do_next = 1; - } - } - - if ($do_next) { - next; - } - } - - push @parents, $parent_name; - - $tmp = (defined @child_arrays)?($#child_arrays + 1):0; - push @child_arrays, "child$tmp"; - - push @demos, {"title" => $parent_name, "file" => "NULL", - "func" => "NULL"}; - } -} - -if (defined @parents) { - $i = 0; - for ($i = 0; $i <= $#parents; $i++) { - $first = 1; - - print "\nDemo ", $child_arrays[$i], "[] = {\n"; - - $j = 0; - for ($j = 0; $j <= $#demos; $j++) { - $href = $demos[$j]; - - if (!defined $demos[$j]) { - next; - } - - if ($demos[$j]{"title"} =~ m|^$parents[$i]/([\w\s]+)$|) { - if ($first) { - $first = 0; - } else { - print ",\n"; - } - - print qq ( { "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL }); - - # hack ... ugly - $demos[$j]{"title"} = "foo"; - } - } - - print ",\n"; - print qq ( { NULL } ); - print "\n};\n"; - } -} - -# sort @demos -@demos_old = @demos; - -@demos = sort { - $a->{"title"} cmp $b->{"title"}; -} @demos_old; - -# sort the child arrays -if (defined @child_arrays) { - for ($i = 0; $i <= $#child_arrays; $i++) { - @foo_old = @{$child_arrays[$i]}; - - @{$child_arrays[$i]} = sort { - $a->{"title"} cmp $b->{"title"}; - } @foo_old; - } -} - -# toplevel -print "\nDemo testgtk_demos[] = {\n"; - -$first = 1; -foreach $href (@demos) { - $handled = 0; - - # ugly evil hack - if ($href->{title} eq "foo") { - next; - } - - if ($first) { - $first = 0; - } else { - print ", \n"; - } - - if (defined @parents) { - for ($i = 0; $i <= $#parents; $i++) { - if ($parents[$i] eq $href->{title}) { - - if ($href->{file} eq 'NULL') { - print qq ( { "$href->{title}", NULL, $href->{func}, $child_arrays[$i] }); - } else { - print qq ( { "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] }); - } - - $handled = 1; - last; - } - } - } - - if ($handled) { - next; - } - - print qq ( { "$href->{title}", "$href->{file}", $href->{func}, NULL }); -} - -print ",\n"; -print qq ( { NULL } ); -print "\n};\n"; - -exit 0;