make libgimp* headers always included before any app headers.

2004-05-06  Manish Singh  <yosh@gimp.org>

        * tools/pdbgen/pdb/app.pl: make libgimp* headers always included
        before any app headers.

        * tools/pdbgen/pdb/paint_tools.pdb: Fix silly "Dodgebure" typo.

        * app/pdb/*_cmds.c: regenerated.
This commit is contained in:
Manish Singh 2004-05-06 23:26:45 +00:00 committed by Manish Singh
parent 61bfe71396
commit 61a3b04825
18 changed files with 92 additions and 64 deletions

View file

@ -1,3 +1,12 @@
2004-05-06 Manish Singh <yosh@gimp.org>
* tools/pdbgen/pdb/app.pl: make libgimp* headers always included
before any app headers.
* tools/pdbgen/pdb/paint_tools.pdb: Fix silly "Dodgebure" typo.
* app/pdb/*_cmds.c: regenerated.
2004-05-06 Sven Neumann <sven@gimp.org>
* app/core/gimpdrawable-preview.c

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -32,8 +34,6 @@
#include "core/gimpchannel.h"
#include "core/gimpimage.h"
#include "libgimpcolor/gimpcolor.h"
static ProcRecord channel_new_proc;
static ProcRecord channel_copy_proc;
static ProcRecord channel_combine_masks_proc;

View file

@ -40,6 +40,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpthumb/gimpthumb.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -54,8 +56,6 @@
#include "plug-in/plug-in.h"
#include "plug-in/plug-ins.h"
#include "libgimpthumb/gimpthumb.h"
static ProcRecord file_load_proc;
static ProcRecord file_save_proc;
static ProcRecord file_load_thumbnail_proc;

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmodule/gimpmodule.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -35,8 +37,6 @@
#include "core/gimp.h"
#include "core/gimptemplate.h"
#include "libgimpmodule/gimpmodule.h"
static ProcRecord gimprc_query_proc;
static ProcRecord gimprc_set_proc;
static ProcRecord get_default_comment_proc;

View file

@ -26,6 +26,10 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -52,10 +56,6 @@
#include "core/gimpviewable.h"
#include "gimp-intl.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
static ProcRecord image_list_proc;
static ProcRecord image_new_proc;
static ProcRecord image_duplicate_proc;

View file

@ -25,13 +25,13 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
#include "procedural_db.h"
#include "core/gimp.h"
#include "libgimpbase/gimpbase.h"
static ProcRecord version_proc;
static ProcRecord quit_proc;

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -48,8 +50,6 @@
#include "paint/gimpsmudgeoptions.h"
#include "paint/paint-types.h"
#include "libgimpmath/gimpmath.h"
static ProcRecord airbrush_proc;
static ProcRecord airbrush_default_proc;
static ProcRecord clone_proc;
@ -747,7 +747,7 @@ static ProcRecord dodgeburn_proc =
{
"gimp_dodgeburn",
"Dodgeburn image with varying exposure.",
"Dodgebure. More details here later.",
"Dodgeburn. More details here later.",
"Andy Thomas",
"Andy Thomas",
"1999",

View file

@ -25,14 +25,14 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
#include "procedural_db.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "libgimpcolor/gimpcolor.h"
static ProcRecord palette_get_foreground_proc;
static ProcRecord palette_get_background_proc;
static ProcRecord palette_set_foreground_proc;

View file

@ -26,6 +26,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -36,8 +38,6 @@
#include "core/gimplist.h"
#include "core/gimppalette.h"
#include "libgimpcolor/gimpcolor.h"
static ProcRecord palettes_refresh_proc;
static ProcRecord palettes_get_list_proc;
static ProcRecord palettes_get_palette_proc;

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpparasite.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -32,8 +34,6 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "libgimpbase/gimpparasite.h"
static ProcRecord parasite_find_proc;
static ProcRecord parasite_attach_proc;
static ProcRecord parasite_detach_proc;

View file

@ -27,6 +27,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -43,9 +45,6 @@
#include "regexrepl/regex.h"
#endif
#include "libgimpbase/gimpbase.h"
static ProcRecord progress_init_proc;
static ProcRecord progress_update_proc;
static ProcRecord plugins_query_proc;

View file

@ -40,7 +40,6 @@
#include "regexrepl/regex.h"
#endif
#define COMPAT_BLURB "This procedure is deprecated! Use '%s' instead."

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -33,8 +35,6 @@
#include "core/gimpimage.h"
#include "gimp-intl.h"
#include "libgimpcolor/gimpcolor.h"
static ProcRecord by_color_select_proc;
static ProcRecord ellipse_select_proc;
static ProcRecord free_select_proc;

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -33,8 +35,6 @@
#include "core/gimplayer.h"
#include "text/gimptext-compat.h"
#include "libgimpbase/gimpbase.h"
static ProcRecord text_fontname_proc;
static ProcRecord text_get_extents_fontname_proc;
static ProcRecord text_proc;

View file

@ -25,6 +25,8 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -35,8 +37,6 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "libgimpmath/gimpmath.h"
static ProcRecord flip_proc;
static ProcRecord perspective_proc;
static ProcRecord rotate_proc;

View file

@ -25,13 +25,13 @@
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
#include "procedural_db.h"
#include "core/gimpunit.h"
#include "libgimpbase/gimpbase.h"
static ProcRecord unit_get_number_of_units_proc;
static ProcRecord unit_get_number_of_built_in_units_proc;
static ProcRecord unit_new_proc;

View file

@ -729,13 +729,21 @@ GPL
my @headers = sort {
my ($x, $y) = ($a, $b);
foreach ($x, $y) {
$_ = "~$_" if /libgimp/;
if (/^</) {
s/^</!/;
}
elsif (!/libgimp/) {
s/^/~/;
}
}
$x cmp $y;
} keys %{$out->{headers}};
my $headers = ""; my $lib = 0; my $seen = 0; my $eek = 0;
my $headers = ""; my $lib = 0; my $seen = 0; my $nl = 0;
my $sys = 0; my $base = 0;
foreach (@headers) {
$headers .= "\n" if $nl;
$nl = 0;
if ($_ eq '<unistd.h>') {
$headers .= "\n" if $seen;
$headers .= "#ifdef HAVE_UNISTD_H\n";
@ -749,8 +757,8 @@ GPL
$seen++ if /^</;
if ($eek == 0 && !/^</) {
$eek = 1;
if ($sys == 0 && !/^</) {
$sys = 1;
$headers .= "\n";
if ($widgets_eek == 1 || $display_eek == 1 || $gui_eek == 1) {
@ -762,6 +770,20 @@ GPL
$headers .= "\n\n";
$headers .= '#include "libgimpbase/gimpbasetypes.h"';
$headers .= "\n\n";
}
$seen = 0 if !/^</;
if (/libgimp/) {
$lib = 1;
}
else {
$headers .= "\n" if $lib;
$lib = 0;
if ($sys == 1 && $base == 0) {
$base = 1;
$headers .= '#include "pdb-types.h"';
$headers .= "\n";
@ -781,13 +803,9 @@ GPL
}
$headers .= '#include "procedural_db.h"';
$headers .= "\n";
$headers .= "\n";
$headers .= "\n\n";
}
}
$seen = 0 if !/^</;
$headers .= "\n" if /libgimp/ && !$lib++ && $headers;
if ($_ eq '"regexrepl/regex.h"') {
$headers .= "\n";
@ -799,17 +817,20 @@ GPL
$headers .= "#include $_\n";
if ($_ eq '"regexrepl/regex.h"') {
$headers .= "#endif\n\n";
$headers .= "#endif\n";
$nl = 1;
}
if ($_ eq '<unistd.h>') {
$headers .= "#endif\n\n";
$headers .= "#endif\n";
$seen = 0;
$nl = 1;
}
if ($_ eq '<process.h>') {
$headers .= "#endif\n\n";
$headers .= "#endif\n";
$seen = 0;
$nl = 1;
}
$headers .= "\n" if $_ eq '"config.h"';

View file

@ -647,7 +647,7 @@ Dodgeburn image with varying exposure.
BLURB
$help = <<'HELP';
Dodgebure. More details here later.
Dodgeburn. More details here later.
HELP