[gtkmm] tools/gen_scripts: gtk+ -> gtk



commit 2165147d890c12735d106ef9c25bbd9f5b519173
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Oct 19 14:43:34 2020 +0200

    tools/gen_scripts: gtk+ -> gtk
    
    gtk+ is now called gtk. jhbuild downloads it to a directory
    called gtk. Use that name for the directory where the scripts
    expect to find gtk's source code.

 tools/gen_scripts/gdk_generate_enums.sh   | 2 +-
 tools/gen_scripts/gdk_generate_methods.sh | 2 +-
 tools/gen_scripts/init_generate.sh        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/tools/gen_scripts/gdk_generate_enums.sh b/tools/gen_scripts/gdk_generate_enums.sh
index ddd0b11a..6b24d349 100755
--- a/tools/gen_scripts/gdk_generate_enums.sh
+++ b/tools/gen_scripts/gdk_generate_enums.sh
@@ -10,7 +10,7 @@ out_dir="$root_dir/gdk/src"
 shopt -s extglob # Enable extended pattern matching
 shopt -s nullglob # Skip a filename pattern that matches no file
 # Process files whose names start with gdk and end with .h, but not with private.h.
-# Exclude gtk+/gdk/gdkinternals.h.
+# Exclude gtk/gdk/gdkinternals.h.
 "$gen_enums" "$gtk_source_prefix"/gdk/gdk!(*private|internals).h 
"$gtk_source_prefix"/gdk/deprecated/!(*private).h \
              "$gtk_build_prefix"/gdk/gdk*.h > "$out_dir"/gdk_enums.defs
 "$gen_enums" "$pixbuf_source_prefix"/gdk-pixbuf/gdk!(*private).h \
diff --git a/tools/gen_scripts/gdk_generate_methods.sh b/tools/gen_scripts/gdk_generate_methods.sh
index 1edaff8d..7e5600ce 100755
--- a/tools/gen_scripts/gdk_generate_methods.sh
+++ b/tools/gen_scripts/gdk_generate_methods.sh
@@ -25,7 +25,7 @@ shopt -s nullglob # Skip a filename pattern that matches no file
 if [ $# -eq 0 ]
 then
   # Process files whose names start with gdk and end with .h, but not with private.h.
-  # Exclude gtk+/gdk/gdkinternals.h.
+  # Exclude gtk/gdk/gdkinternals.h.
   "$gen_methods" "$gtk_source_prefix"/gdk/gdk!(*private|internals).h 
"$gtk_source_prefix"/gdk/deprecated/!(*private).h \
                  "$gtk_build_prefix"/gdk/gdk*.h > "$out_dir"/gdk_methods.defs
   "$gen_methods" "$pixbuf_source_prefix"/gdk-pixbuf/gdk!(*private).h \
diff --git a/tools/gen_scripts/init_generate.sh b/tools/gen_scripts/init_generate.sh
index ba31a29f..d485dc79 100755
--- a/tools/gen_scripts/init_generate.sh
+++ b/tools/gen_scripts/init_generate.sh
@@ -39,12 +39,12 @@ gen_enums="$GMMPROC_GEN_SOURCE_DIR/glibmm/tools/enum.pl"
 # autotools support, but don't require, non-source-dir builds.
 extra_defs_gen_dir="$GMMPROC_GEN_BUILD_DIR/gtkmm/tools/extra_defs_gen"
 
-gtk_source_prefix="$GMMPROC_GEN_SOURCE_DIR/gtk+"
-gtk_build_prefix="$GMMPROC_GEN_BUILD_DIR/gtk+"
+gtk_source_prefix="$GMMPROC_GEN_SOURCE_DIR/gtk"
+gtk_build_prefix="$GMMPROC_GEN_BUILD_DIR/gtk"
 pixbuf_source_prefix="$GMMPROC_GEN_SOURCE_DIR/gdk-pixbuf"
 pixbuf_build_prefix="$GMMPROC_GEN_BUILD_DIR/gdk-pixbuf"
 if [ "$GMMPROC_GEN_SOURCE_DIR" == "$GMMPROC_GEN_BUILD_DIR" ]; then
-  # gtk+ and gdk-pixbuf are built with meson, which requires non-source-dir builds.
+  # gtk and gdk-pixbuf are built with meson, which requires non-source-dir builds.
   # This is what jhbuild does, if neccesary, to force non-source-dir builds.
   gtk_build_prefix="$gtk_build_prefix/build"
   pixbuf_build_prefix="$pixbuf_build_prefix/build"


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