[gtkmm] tools/gen_scripts: Don't read private.h files



commit 41d386b771f267f5aca5e5dc85735eeb48034bf9
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Thu Jul 30 19:35:30 2015 +0200

    tools/gen_scripts: Don't read private.h files
    
    * tools/gen_scripts/gdk_generate_enums.sh:
    * tools/gen_scripts/gdk_generate_methods.sh:
    * tools/gen_scripts/gtk_generate_enums.sh:
    * tools/gen_scripts/gtk_generate_methods.sh: Don't collect information
    from header files with names ending in private.h.

 tools/gen_scripts/gdk_generate_enums.sh   |    6 ++++--
 tools/gen_scripts/gdk_generate_methods.sh |    6 ++++--
 tools/gen_scripts/gtk_generate_enums.sh   |    4 +++-
 tools/gen_scripts/gtk_generate_methods.sh |    4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/tools/gen_scripts/gdk_generate_enums.sh b/tools/gen_scripts/gdk_generate_enums.sh
index 5515b0d..cddb378 100755
--- a/tools/gen_scripts/gdk_generate_enums.sh
+++ b/tools/gen_scripts/gdk_generate_enums.sh
@@ -13,6 +13,8 @@ PREFIX="$JHBUILD_SOURCES"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gdk/src"
 
+shopt -s extglob # Enable extended pattern matching
 ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
-$ENUM_PL "$PREFIX"/gtk+/gdk/*.h > "$OUT_DIR"/gdk_enums.defs
-$ENUM_PL "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk*.h > "$OUT_DIR"/gdk_pixbuf_enums.defs
+# Process files whose names end with .h, but not with private.h.
+$ENUM_PL "$PREFIX"/gtk+/gdk/!(*private).h "$PREFIX"/gtk+/gdk/deprecated/!(*private).h > 
"$OUT_DIR"/gdk_enums.defs
+$ENUM_PL "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk!(*private).h > "$OUT_DIR"/gdk_pixbuf_enums.defs
diff --git a/tools/gen_scripts/gdk_generate_methods.sh b/tools/gen_scripts/gdk_generate_methods.sh
index 1682ec1..49c5cc2 100755
--- a/tools/gen_scripts/gdk_generate_methods.sh
+++ b/tools/gen_scripts/gdk_generate_methods.sh
@@ -13,6 +13,8 @@ PREFIX="$JHBUILD_SOURCES"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gdk/src"
 
+shopt -s extglob # Enable extended pattern matching
 H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py"
-$H2DEF_PY "$PREFIX"/gtk+/gdk/*.h "$PREFIX"/gtk+/gdk/deprecated/*.h > "$OUT_DIR"/gdk_methods.defs
-$H2DEF_PY "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk*.h > "$OUT_DIR"/gdk_pixbuf_methods.defs
+# Process files whose names end with .h, but not with private.h.
+$H2DEF_PY "$PREFIX"/gtk+/gdk/!(*private).h "$PREFIX"/gtk+/gdk/deprecated/!(*private).h > 
"$OUT_DIR"/gdk_methods.defs
+$H2DEF_PY "$PREFIX"/gdk-pixbuf/gdk-pixbuf/gdk!(*private).h > "$OUT_DIR"/gdk_pixbuf_methods.defs
diff --git a/tools/gen_scripts/gtk_generate_enums.sh b/tools/gen_scripts/gtk_generate_enums.sh
index f7dda1e..8e31aa8 100755
--- a/tools/gen_scripts/gtk_generate_enums.sh
+++ b/tools/gen_scripts/gtk_generate_enums.sh
@@ -13,5 +13,7 @@ PREFIX="$JHBUILD_SOURCES/gtk+"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"
 
+shopt -s extglob # Enable extended pattern matching
 ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
-$ENUM_PL "$PREFIX"/gtk/*.h "$PREFIX"/gtk/deprecated/*.h > "$OUT_DIR"/gtk_enums.defs
+# Process files whose names end with .h, but not with private.h.
+$ENUM_PL "$PREFIX"/gtk/!(*private).h "$PREFIX"/gtk/deprecated/!(*private).h > "$OUT_DIR"/gtk_enums.defs
diff --git a/tools/gen_scripts/gtk_generate_methods.sh b/tools/gen_scripts/gtk_generate_methods.sh
index 6239ccf..7a41587 100755
--- a/tools/gen_scripts/gtk_generate_methods.sh
+++ b/tools/gen_scripts/gtk_generate_methods.sh
@@ -13,5 +13,7 @@ PREFIX="$JHBUILD_SOURCES/gtk+"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"
 
+shopt -s extglob # Enable extended pattern matching
 H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py"
-$H2DEF_PY "$PREFIX"/gtk/*.h "$PREFIX"/gtk/deprecated/*.h > "$OUT_DIR"/gtk_methods.defs
+# Process files whose names end with .h, but not with private.h.
+$H2DEF_PY "$PREFIX"/gtk/!(*private).h "$PREFIX"/gtk/deprecated/!(*private).h > "$OUT_DIR"/gtk_methods.defs


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]