diff --git a/HACKING b/HACKING index 7d3fdc7fc7..b4eb9273e5 100644 --- a/HACKING +++ b/HACKING @@ -116,7 +116,7 @@ sources. All those files have a short notice about being generated somewhere at the top. Among them are the files ending in pdb.[ch] in the libgimp directory and the files ending in cmds.c in the app/pdb subdirectory. Those are generated from the respective .pdb files in -tools/pdbgen/pdb. +pdb/groups. Hackordnung diff --git a/Makefile.am b/Makefile.am index eddac258ee..e2e2ad8db0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,10 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} +if WITH_PDBGEN +PDB = pdb +endif + SUBDIRS = \ m4macros \ cursors \ @@ -17,6 +21,7 @@ SUBDIRS = \ menus \ libgimpbase \ tools \ + $(PDB) \ icons \ libgimpcolor \ libgimpmath \ diff --git a/app/app.c b/app/app.c index 377c18eeac..345326f4e1 100644 --- a/app/app.c +++ b/app/app.c @@ -118,7 +118,7 @@ app_libs_init (GOptionContext *context, } #endif - /* keep compat enum code in sync with tools/pdbgen/enumcode.pl */ + /* keep compat enum code in sync with pdb/enumcode.pl */ quark = g_quark_from_static_string ("gimp-compat-enum"); g_type_set_qdata (GIMP_TYPE_CONVERT_DITHER_TYPE, quark, diff --git a/app/core/core-enums.h b/app/core/core-enums.h index 2dd1fc82b0..51db731cf7 100644 --- a/app/core/core-enums.h +++ b/app/core/core-enums.h @@ -20,7 +20,7 @@ #if 0 - This file is parsed by two scripts, enumgen.pl in tools/pdbgen, + This file is parsed by two scripts, enumgen.pl in pdb, and gimp-mkenums. All enums that are not marked with /*< pdb-skip >*/ are exported to libgimp and the PDB. Enums that are not marked with /*< skip >*/ are registered with the GType system. diff --git a/app/paint/paint-enums.h b/app/paint/paint-enums.h index 95d89d09a1..44f01b4a2a 100644 --- a/app/paint/paint-enums.h +++ b/app/paint/paint-enums.h @@ -19,7 +19,7 @@ #define __PAINT_ENUMS_H__ #if 0 - This file is parsed by two scripts, enumgen.pl in tools/pdbgen, + This file is parsed by two scripts, enumgen.pl in pdb, and gimp-mkenums. All enums that are not marked with /*< pdb-skip >*/ are exported to libgimp and the PDB. Enums that are not marked with /*< skip >*/ are registered with the GType system. diff --git a/app/pdb/README b/app/pdb/README index 0aa89b7bbc..2205ba6e62 100644 --- a/app/pdb/README +++ b/app/pdb/README @@ -3,5 +3,5 @@ Gimp functions. THESE FILES ARE AUTOGENERATED AND CHANGES HERE ARE USELESS! -If you need to change the code please have a look in ../../tools/pdbgen/pdb. +If you need to change the code please have a look in ../../pdb/groups. diff --git a/configure.ac b/configure.ac index fc00af8fdf..a5cb3286a4 100644 --- a/configure.ac +++ b/configure.ac @@ -2480,7 +2480,7 @@ _______EOF AC_CONFIG_FILES([ INSTALL tools/Makefile -tools/pdbgen/Makefile +pdb/Makefile libgimp/Makefile libgimpbase/Makefile libgimpconfig/Makefile diff --git a/tools/pdbgen/.gitignore b/pdb/.gitignore similarity index 100% rename from tools/pdbgen/.gitignore rename to pdb/.gitignore diff --git a/tools/pdbgen/Makefile.am b/pdb/Makefile.am similarity index 54% rename from tools/pdbgen/Makefile.am rename to pdb/Makefile.am index a1fc0cd73c..eab66dc06a 100644 --- a/tools/pdbgen/Makefile.am +++ b/pdb/Makefile.am @@ -1,63 +1,63 @@ PDBGEN_BACKUP = 0 PDBGEN_GROUPS = -pdb_sources = \ - pdb/brush.pdb \ - pdb/brush_select.pdb \ - pdb/brushes.pdb \ - pdb/buffer.pdb \ - pdb/channel.pdb \ - pdb/color.pdb \ - pdb/context.pdb \ - pdb/debug.pdb \ - pdb/display.pdb \ - pdb/drawable.pdb \ - pdb/drawable_color.pdb \ - pdb/drawable_transform.pdb \ - pdb/dynamics.pdb \ - pdb/edit.pdb \ - pdb/fileops.pdb \ - pdb/floating_sel.pdb \ - pdb/font_select.pdb \ - pdb/fonts.pdb \ - pdb/gimp.pdb \ - pdb/gimprc.pdb \ - pdb/gradient.pdb \ - pdb/gradient_select.pdb \ - pdb/gradients.pdb \ - pdb/help.pdb \ - pdb/image.pdb \ - pdb/image_color_profile.pdb \ - pdb/image_convert.pdb \ - pdb/image_grid.pdb \ - pdb/image_guides.pdb \ - pdb/image_sample_points.pdb \ - pdb/image_select.pdb \ - pdb/image_transform.pdb \ - pdb/image_undo.pdb \ - pdb/item.pdb \ - pdb/item_transform.pdb \ - pdb/layer.pdb \ - pdb/message.pdb \ - pdb/paint_tools.pdb \ - pdb/palette.pdb \ - pdb/palette_select.pdb \ - pdb/palettes.pdb \ - pdb/paths.pdb \ - pdb/pattern.pdb \ - pdb/pattern_select.pdb \ - pdb/patterns.pdb \ - pdb/plug_in.pdb \ - pdb/plug_in_compat.pdb \ - pdb/procedural_db.pdb \ - pdb/progress.pdb \ - pdb/selection.pdb \ - pdb/selection_tools.pdb \ - pdb/text_layer.pdb \ - pdb/text_tool.pdb \ - pdb/transform_tools.pdb \ - pdb/unit.pdb \ - pdb/vectors.pdb +pdb_groups = \ + groups/brush.pdb \ + groups/brush_select.pdb \ + groups/brushes.pdb \ + groups/buffer.pdb \ + groups/channel.pdb \ + groups/color.pdb \ + groups/context.pdb \ + groups/debug.pdb \ + groups/display.pdb \ + groups/drawable.pdb \ + groups/drawable_color.pdb \ + groups/drawable_transform.pdb \ + groups/dynamics.pdb \ + groups/edit.pdb \ + groups/fileops.pdb \ + groups/floating_sel.pdb \ + groups/font_select.pdb \ + groups/fonts.pdb \ + groups/gimp.pdb \ + groups/gimprc.pdb \ + groups/gradient.pdb \ + groups/gradient_select.pdb \ + groups/gradients.pdb \ + groups/help.pdb \ + groups/image.pdb \ + groups/image_color_profile.pdb \ + groups/image_convert.pdb \ + groups/image_grid.pdb \ + groups/image_guides.pdb \ + groups/image_sample_points.pdb \ + groups/image_select.pdb \ + groups/image_transform.pdb \ + groups/image_undo.pdb \ + groups/item.pdb \ + groups/item_transform.pdb \ + groups/layer.pdb \ + groups/message.pdb \ + groups/paint_tools.pdb \ + groups/palette.pdb \ + groups/palette_select.pdb \ + groups/palettes.pdb \ + groups/paths.pdb \ + groups/pattern.pdb \ + groups/pattern_select.pdb \ + groups/patterns.pdb \ + groups/plug_in.pdb \ + groups/plug_in_compat.pdb \ + groups/procedural_db.pdb \ + groups/progress.pdb \ + groups/selection.pdb \ + groups/selection_tools.pdb \ + groups/text_layer.pdb \ + groups/text_tool.pdb \ + groups/transform_tools.pdb \ + groups/unit.pdb \ + groups/vectors.pdb EXTRA_DIST = \ README \ @@ -72,14 +72,14 @@ EXTRA_DIST = \ pdbgen.pl \ stddefs.pdb \ util.pl \ - $(pdb_sources) + $(pdb_groups) enum_headers = \ - ../../libgimpbase/gimpbaseenums.h \ - ../../libgimpconfig/gimpconfigenums.h \ - ../../app/operations/operations-enums.h \ - ../../app/core/core-enums.h \ - ../../app/paint/paint-enums.h + ../libgimpbase/gimpbaseenums.h \ + ../libgimpconfig/gimpconfigenums.h \ + ../app/operations/operations-enums.h \ + ../app/core/core-enums.h \ + ../app/paint/paint-enums.h pdb_scripts = \ pdbgen.pl \ @@ -125,8 +125,8 @@ stamp-groups: Makefile.am rootme=`pwd`; cd $(srcdir) \ && echo "# This file is autogenerated" > $$rootme/groups.pl.tmp \ && echo "@groups = qw(" >> $$rootme/groups.pl.tmp \ - && (for pdb in $(pdb_sources); do \ - group=`echo $$pdb | sed -e 's%pdb/\([^.]*\)\..*%\1%'`; \ + && (for pdb in $(pdb_groups); do \ + group=`echo $$pdb | sed -e 's%groups/\([^.]*\)\..*%\1%'`; \ echo " $$group" >> $$rootme/groups.pl.tmp; \ done) \ && echo ");" >> $$rootme/groups.pl.tmp \ @@ -135,7 +135,7 @@ stamp-groups: Makefile.am && rm $$rootme/groups.pl.tmp \ && echo timestamp > $$rootme/stamp-groups -stamp-pdbgen: $(pdbgen_deps) $(pdb_scripts) $(pdb_sources) Makefile.am +stamp-pdbgen: $(pdbgen_deps) $(pdb_scripts) $(pdb_groups) Makefile.am rootme=`pwd`; \ destdir=`cd $(top_srcdir) && pwd`; export destdir; \ builddir=`cd $(top_builddir) && pwd`; export builddir; \ diff --git a/tools/pdbgen/README b/pdb/README similarity index 100% rename from tools/pdbgen/README rename to pdb/README diff --git a/tools/pdbgen/README_NEW_PDB_PROC b/pdb/README_NEW_PDB_PROC similarity index 97% rename from tools/pdbgen/README_NEW_PDB_PROC rename to pdb/README_NEW_PDB_PROC index aed91d5a28..19f8e4d9c8 100644 --- a/tools/pdbgen/README_NEW_PDB_PROC +++ b/pdb/README_NEW_PDB_PROC @@ -63,7 +63,7 @@ http://git.gnome.org/browse/gimp/tree/tools/pdbgen/pdb[tools/pdbgen/pdb]. You can see many files with the .pdb suffix - these are special template files which include the actual source of the PDB functions. Let's take a quick look at one of these - text_layer_get_text in -http://git.gnome.org/browse/gimp/tree/tools/pdbgen/pdb/text_layer.pdb[tools/pdbgen/pdb/text_layer.pdb]. +http://git.gnome.org/browse/gimp/tree/pdb/groups/text_layer.pdb[pdb/groups/text_layer.pdb]. [source,perl] ---- @@ -337,7 +337,7 @@ this can be done automatically for you if the desired enum is one of the enums which are already used by GIMP. To make it clearer, let's take a look at +layer_get_mode+ in -http://git.gnome.org/browse/gimp/tree/tools/pdbgen/pdb/layer.pdb[tools/pdbgen/pdb/layer.pdb]: +http://git.gnome.org/browse/gimp/tree/pdb/groups/layer.pdb[pdb/groups/layer.pdb]: [source,perl] ---- @@ -388,7 +388,7 @@ function, and by that we can make sure it won't be called with values out of range (GIMP will make sure the values are inside the specified range before it calls our function). To see an example, let's take look at the procedure image_new from -http://git.gnome.org/browse/gimp/tree/tools/pdbgen/pdb/image.pdb[tools/pdbgen/pdb/image.pdb]: +http://git.gnome.org/browse/gimp/tree/pdb/groups/image.pdb[pdb/groups/image.pdb]: [source,perl] ---- @@ -435,7 +435,7 @@ function which receives an array. Array arguments are specified in a special way which is a bit different than the other arguments. To see how array arguments are specified, let's take a look at the +@outargs+ of +vectors_stroke_get_points+ from -http://git.gnome.org/browse/gimp/tree/tools/pdbgen/pdb/vectors.pdb[tools/pdbgen/pdb/vectors.pdb]: +http://git.gnome.org/browse/gimp/tree/pdb/groups/vectors.pdb[pdb/groups/vectors.pdb]: [source,perl] ---- diff --git a/tools/pdbgen/app.pl b/pdb/app.pl similarity index 100% rename from tools/pdbgen/app.pl rename to pdb/app.pl diff --git a/tools/pdbgen/enumcode.pl b/pdb/enumcode.pl similarity index 100% rename from tools/pdbgen/enumcode.pl rename to pdb/enumcode.pl diff --git a/tools/pdbgen/enumgen.pl b/pdb/enumgen.pl similarity index 100% rename from tools/pdbgen/enumgen.pl rename to pdb/enumgen.pl diff --git a/tools/pdbgen/enums.pl b/pdb/enums.pl similarity index 100% rename from tools/pdbgen/enums.pl rename to pdb/enums.pl diff --git a/tools/pdbgen/groups.pl b/pdb/groups.pl similarity index 100% rename from tools/pdbgen/groups.pl rename to pdb/groups.pl diff --git a/tools/pdbgen/pdb/brush.pdb b/pdb/groups/brush.pdb similarity index 100% rename from tools/pdbgen/pdb/brush.pdb rename to pdb/groups/brush.pdb diff --git a/tools/pdbgen/pdb/brush_select.pdb b/pdb/groups/brush_select.pdb similarity index 100% rename from tools/pdbgen/pdb/brush_select.pdb rename to pdb/groups/brush_select.pdb diff --git a/tools/pdbgen/pdb/brushes.pdb b/pdb/groups/brushes.pdb similarity index 100% rename from tools/pdbgen/pdb/brushes.pdb rename to pdb/groups/brushes.pdb diff --git a/tools/pdbgen/pdb/buffer.pdb b/pdb/groups/buffer.pdb similarity index 100% rename from tools/pdbgen/pdb/buffer.pdb rename to pdb/groups/buffer.pdb diff --git a/tools/pdbgen/pdb/channel.pdb b/pdb/groups/channel.pdb similarity index 100% rename from tools/pdbgen/pdb/channel.pdb rename to pdb/groups/channel.pdb diff --git a/tools/pdbgen/pdb/color.pdb b/pdb/groups/color.pdb similarity index 100% rename from tools/pdbgen/pdb/color.pdb rename to pdb/groups/color.pdb diff --git a/tools/pdbgen/pdb/context.pdb b/pdb/groups/context.pdb similarity index 100% rename from tools/pdbgen/pdb/context.pdb rename to pdb/groups/context.pdb diff --git a/tools/pdbgen/pdb/debug.pdb b/pdb/groups/debug.pdb similarity index 100% rename from tools/pdbgen/pdb/debug.pdb rename to pdb/groups/debug.pdb diff --git a/tools/pdbgen/pdb/display.pdb b/pdb/groups/display.pdb similarity index 100% rename from tools/pdbgen/pdb/display.pdb rename to pdb/groups/display.pdb diff --git a/tools/pdbgen/pdb/drawable.pdb b/pdb/groups/drawable.pdb similarity index 100% rename from tools/pdbgen/pdb/drawable.pdb rename to pdb/groups/drawable.pdb diff --git a/tools/pdbgen/pdb/drawable_color.pdb b/pdb/groups/drawable_color.pdb similarity index 100% rename from tools/pdbgen/pdb/drawable_color.pdb rename to pdb/groups/drawable_color.pdb diff --git a/tools/pdbgen/pdb/drawable_transform.pdb b/pdb/groups/drawable_transform.pdb similarity index 100% rename from tools/pdbgen/pdb/drawable_transform.pdb rename to pdb/groups/drawable_transform.pdb diff --git a/tools/pdbgen/pdb/dynamics.pdb b/pdb/groups/dynamics.pdb similarity index 100% rename from tools/pdbgen/pdb/dynamics.pdb rename to pdb/groups/dynamics.pdb diff --git a/tools/pdbgen/pdb/edit.pdb b/pdb/groups/edit.pdb similarity index 100% rename from tools/pdbgen/pdb/edit.pdb rename to pdb/groups/edit.pdb diff --git a/tools/pdbgen/pdb/fileops.pdb b/pdb/groups/fileops.pdb similarity index 100% rename from tools/pdbgen/pdb/fileops.pdb rename to pdb/groups/fileops.pdb diff --git a/tools/pdbgen/pdb/floating_sel.pdb b/pdb/groups/floating_sel.pdb similarity index 100% rename from tools/pdbgen/pdb/floating_sel.pdb rename to pdb/groups/floating_sel.pdb diff --git a/tools/pdbgen/pdb/font_select.pdb b/pdb/groups/font_select.pdb similarity index 100% rename from tools/pdbgen/pdb/font_select.pdb rename to pdb/groups/font_select.pdb diff --git a/tools/pdbgen/pdb/fonts.pdb b/pdb/groups/fonts.pdb similarity index 100% rename from tools/pdbgen/pdb/fonts.pdb rename to pdb/groups/fonts.pdb diff --git a/tools/pdbgen/pdb/gimp.pdb b/pdb/groups/gimp.pdb similarity index 100% rename from tools/pdbgen/pdb/gimp.pdb rename to pdb/groups/gimp.pdb diff --git a/tools/pdbgen/pdb/gimprc.pdb b/pdb/groups/gimprc.pdb similarity index 100% rename from tools/pdbgen/pdb/gimprc.pdb rename to pdb/groups/gimprc.pdb diff --git a/tools/pdbgen/pdb/gradient.pdb b/pdb/groups/gradient.pdb similarity index 100% rename from tools/pdbgen/pdb/gradient.pdb rename to pdb/groups/gradient.pdb diff --git a/tools/pdbgen/pdb/gradient_select.pdb b/pdb/groups/gradient_select.pdb similarity index 100% rename from tools/pdbgen/pdb/gradient_select.pdb rename to pdb/groups/gradient_select.pdb diff --git a/tools/pdbgen/pdb/gradients.pdb b/pdb/groups/gradients.pdb similarity index 100% rename from tools/pdbgen/pdb/gradients.pdb rename to pdb/groups/gradients.pdb diff --git a/tools/pdbgen/pdb/help.pdb b/pdb/groups/help.pdb similarity index 100% rename from tools/pdbgen/pdb/help.pdb rename to pdb/groups/help.pdb diff --git a/tools/pdbgen/pdb/image.pdb b/pdb/groups/image.pdb similarity index 100% rename from tools/pdbgen/pdb/image.pdb rename to pdb/groups/image.pdb diff --git a/tools/pdbgen/pdb/image_color_profile.pdb b/pdb/groups/image_color_profile.pdb similarity index 100% rename from tools/pdbgen/pdb/image_color_profile.pdb rename to pdb/groups/image_color_profile.pdb diff --git a/tools/pdbgen/pdb/image_convert.pdb b/pdb/groups/image_convert.pdb similarity index 100% rename from tools/pdbgen/pdb/image_convert.pdb rename to pdb/groups/image_convert.pdb diff --git a/tools/pdbgen/pdb/image_grid.pdb b/pdb/groups/image_grid.pdb similarity index 100% rename from tools/pdbgen/pdb/image_grid.pdb rename to pdb/groups/image_grid.pdb diff --git a/tools/pdbgen/pdb/image_guides.pdb b/pdb/groups/image_guides.pdb similarity index 100% rename from tools/pdbgen/pdb/image_guides.pdb rename to pdb/groups/image_guides.pdb diff --git a/tools/pdbgen/pdb/image_sample_points.pdb b/pdb/groups/image_sample_points.pdb similarity index 100% rename from tools/pdbgen/pdb/image_sample_points.pdb rename to pdb/groups/image_sample_points.pdb diff --git a/tools/pdbgen/pdb/image_select.pdb b/pdb/groups/image_select.pdb similarity index 100% rename from tools/pdbgen/pdb/image_select.pdb rename to pdb/groups/image_select.pdb diff --git a/tools/pdbgen/pdb/image_transform.pdb b/pdb/groups/image_transform.pdb similarity index 100% rename from tools/pdbgen/pdb/image_transform.pdb rename to pdb/groups/image_transform.pdb diff --git a/tools/pdbgen/pdb/image_undo.pdb b/pdb/groups/image_undo.pdb similarity index 100% rename from tools/pdbgen/pdb/image_undo.pdb rename to pdb/groups/image_undo.pdb diff --git a/tools/pdbgen/pdb/item.pdb b/pdb/groups/item.pdb similarity index 100% rename from tools/pdbgen/pdb/item.pdb rename to pdb/groups/item.pdb diff --git a/tools/pdbgen/pdb/item_transform.pdb b/pdb/groups/item_transform.pdb similarity index 100% rename from tools/pdbgen/pdb/item_transform.pdb rename to pdb/groups/item_transform.pdb diff --git a/tools/pdbgen/pdb/layer.pdb b/pdb/groups/layer.pdb similarity index 100% rename from tools/pdbgen/pdb/layer.pdb rename to pdb/groups/layer.pdb diff --git a/tools/pdbgen/pdb/message.pdb b/pdb/groups/message.pdb similarity index 100% rename from tools/pdbgen/pdb/message.pdb rename to pdb/groups/message.pdb diff --git a/tools/pdbgen/pdb/paint_tools.pdb b/pdb/groups/paint_tools.pdb similarity index 100% rename from tools/pdbgen/pdb/paint_tools.pdb rename to pdb/groups/paint_tools.pdb diff --git a/tools/pdbgen/pdb/palette.pdb b/pdb/groups/palette.pdb similarity index 100% rename from tools/pdbgen/pdb/palette.pdb rename to pdb/groups/palette.pdb diff --git a/tools/pdbgen/pdb/palette_select.pdb b/pdb/groups/palette_select.pdb similarity index 100% rename from tools/pdbgen/pdb/palette_select.pdb rename to pdb/groups/palette_select.pdb diff --git a/tools/pdbgen/pdb/palettes.pdb b/pdb/groups/palettes.pdb similarity index 100% rename from tools/pdbgen/pdb/palettes.pdb rename to pdb/groups/palettes.pdb diff --git a/tools/pdbgen/pdb/paths.pdb b/pdb/groups/paths.pdb similarity index 100% rename from tools/pdbgen/pdb/paths.pdb rename to pdb/groups/paths.pdb diff --git a/tools/pdbgen/pdb/pattern.pdb b/pdb/groups/pattern.pdb similarity index 100% rename from tools/pdbgen/pdb/pattern.pdb rename to pdb/groups/pattern.pdb diff --git a/tools/pdbgen/pdb/pattern_select.pdb b/pdb/groups/pattern_select.pdb similarity index 100% rename from tools/pdbgen/pdb/pattern_select.pdb rename to pdb/groups/pattern_select.pdb diff --git a/tools/pdbgen/pdb/patterns.pdb b/pdb/groups/patterns.pdb similarity index 100% rename from tools/pdbgen/pdb/patterns.pdb rename to pdb/groups/patterns.pdb diff --git a/tools/pdbgen/pdb/plug_in.pdb b/pdb/groups/plug_in.pdb similarity index 100% rename from tools/pdbgen/pdb/plug_in.pdb rename to pdb/groups/plug_in.pdb diff --git a/tools/pdbgen/pdb/plug_in_compat.pdb b/pdb/groups/plug_in_compat.pdb similarity index 100% rename from tools/pdbgen/pdb/plug_in_compat.pdb rename to pdb/groups/plug_in_compat.pdb diff --git a/tools/pdbgen/pdb/procedural_db.pdb b/pdb/groups/procedural_db.pdb similarity index 100% rename from tools/pdbgen/pdb/procedural_db.pdb rename to pdb/groups/procedural_db.pdb diff --git a/tools/pdbgen/pdb/progress.pdb b/pdb/groups/progress.pdb similarity index 100% rename from tools/pdbgen/pdb/progress.pdb rename to pdb/groups/progress.pdb diff --git a/tools/pdbgen/pdb/selection.pdb b/pdb/groups/selection.pdb similarity index 100% rename from tools/pdbgen/pdb/selection.pdb rename to pdb/groups/selection.pdb diff --git a/tools/pdbgen/pdb/selection_tools.pdb b/pdb/groups/selection_tools.pdb similarity index 100% rename from tools/pdbgen/pdb/selection_tools.pdb rename to pdb/groups/selection_tools.pdb diff --git a/tools/pdbgen/pdb/text_layer.pdb b/pdb/groups/text_layer.pdb similarity index 100% rename from tools/pdbgen/pdb/text_layer.pdb rename to pdb/groups/text_layer.pdb diff --git a/tools/pdbgen/pdb/text_tool.pdb b/pdb/groups/text_tool.pdb similarity index 100% rename from tools/pdbgen/pdb/text_tool.pdb rename to pdb/groups/text_tool.pdb diff --git a/tools/pdbgen/pdb/transform_tools.pdb b/pdb/groups/transform_tools.pdb similarity index 100% rename from tools/pdbgen/pdb/transform_tools.pdb rename to pdb/groups/transform_tools.pdb diff --git a/tools/pdbgen/pdb/unit.pdb b/pdb/groups/unit.pdb similarity index 100% rename from tools/pdbgen/pdb/unit.pdb rename to pdb/groups/unit.pdb diff --git a/tools/pdbgen/pdb/vectors.pdb b/pdb/groups/vectors.pdb similarity index 100% rename from tools/pdbgen/pdb/vectors.pdb rename to pdb/groups/vectors.pdb diff --git a/tools/pdbgen/lib.pl b/pdb/lib.pl similarity index 100% rename from tools/pdbgen/lib.pl rename to pdb/lib.pl diff --git a/tools/pdbgen/pdb.pl b/pdb/pdb.pl similarity index 100% rename from tools/pdbgen/pdb.pl rename to pdb/pdb.pl diff --git a/tools/pdbgen/pdbgen.pl b/pdb/pdbgen.pl similarity index 98% rename from tools/pdbgen/pdbgen.pl rename to pdb/pdbgen.pl index e1df743285..403aafa56f 100755 --- a/tools/pdbgen/pdbgen.pl +++ b/pdb/pdbgen.pl @@ -89,7 +89,7 @@ $evalcode = <<'CODE'; foreach (@groupvars) { eval "undef $_" } # Load the file in and get the group info - &$safeeval("require '$main::srcdir/pdb/$file.pdb'"); + &$safeeval("require '$main::srcdir/groups/$file.pdb'"); # Save these for later &$copyvars(\$grp{$file}, @groupvars); @@ -120,7 +120,7 @@ CODE # Slurp in the PDB defs foreach $file (@groups) { - print "Processing $srcdir/pdb/$file.pdb...\n"; + print "Processing $srcdir/groups/$file.pdb...\n"; eval "package Gimp::CodeGen::Safe::$file; $evalcode;"; die $@ if $@; } diff --git a/tools/pdbgen/stddefs.pdb b/pdb/stddefs.pdb similarity index 100% rename from tools/pdbgen/stddefs.pdb rename to pdb/stddefs.pdb diff --git a/tools/pdbgen/util.pl b/pdb/util.pl similarity index 100% rename from tools/pdbgen/util.pl rename to pdb/util.pl diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index 8a611399b6..90f66d4da4 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -use lib '../../tools/pdbgen'; +use lib '../../pdb'; require 'util.pl'; diff --git a/tools/Makefile.am b/tools/Makefile.am index 3184da96c9..37e7b336b2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,12 +2,6 @@ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la -if WITH_PDBGEN -PDBGEN = pdbgen -endif - -SUBDIRS = $(PDBGEN) - if OS_WIN32 bin_PROGRAMS = \ @@ -94,4 +88,3 @@ EXTRA_DIST = \ gimp-mkenums \ gimppath2svg.py \ invert-svg.c -