From dafe304f0353f039983ec3ea92d668716d50e5c2 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Fri, 28 Dec 2018 16:59:58 +0100 Subject: tools/gen_scripts/init_generate.sh: glibmm -> glibmm-2.4 init_generate.sh was too quickly copied from the master branch. glibmm-2.4 shall use its own scripts and extra_defs_gen files. --- tools/gen_scripts/init_generate.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/gen_scripts/init_generate.sh b/tools/gen_scripts/init_generate.sh index d0d81f7c..d117e81e 100755 --- a/tools/gen_scripts/init_generate.sh +++ b/tools/gen_scripts/init_generate.sh @@ -1,6 +1,6 @@ #!/bin/bash -# This file is part of glibmm. +# This file is part of glibmm-2.4. # Initializes some variables for the scripts that generate docs and defs files. # Not intented to be called directly from the command line. @@ -16,7 +16,7 @@ # Usually you can leave GMMPROC_GEN_SOURCE_DIR undefined. # If you have set buildroot=None, GMMPROC_GEN_BUILD_DIR can also be undefined. -# Root directory of glibmm source files. +# Root directory of glibmm-2.4 source files. root_dir="$(dirname "$0")/../.." # Where to search for source files. @@ -29,16 +29,16 @@ if [ -z "$GMMPROC_GEN_BUILD_DIR" ]; then GMMPROC_GEN_BUILD_DIR="$GMMPROC_GEN_SOURCE_DIR" fi -# Scripts in glibmm. These are source files. -gen_docs="$GMMPROC_GEN_SOURCE_DIR/glibmm/tools/defs_gen/docextract_to_xml.py" -gen_methods="$GMMPROC_GEN_SOURCE_DIR/glibmm/tools/defs_gen/h2def.py" -gen_enums="$GMMPROC_GEN_SOURCE_DIR/glibmm/tools/enum.pl" +# Scripts in glibmm-2.4. These are source files. +gen_docs="$GMMPROC_GEN_SOURCE_DIR/glibmm-2.4/tools/defs_gen/docextract_to_xml.py" +gen_methods="$GMMPROC_GEN_SOURCE_DIR/glibmm-2.4/tools/defs_gen/h2def.py" +gen_enums="$GMMPROC_GEN_SOURCE_DIR/glibmm-2.4/tools/enum.pl" # Where to find executables that generate extra defs (signals and properties). -# glibmm is built with autotools. -# autotools support non-source-dir builds, but glibmm does not. -# See the glibmm entry in jhbuild's modulesets files. -extra_defs_gen_dir="$GMMPROC_GEN_SOURCE_DIR/glibmm/tools/extra_defs_gen" +# glibmm-2.4 is built with autotools. +# autotools support non-source-dir builds, but glibmm-2.4 does not. +# See the glibmm-2.4 entry in jhbuild's modulesets files. +extra_defs_gen_dir="$GMMPROC_GEN_SOURCE_DIR/glibmm-2.4/tools/extra_defs_gen" source_prefix="$GMMPROC_GEN_SOURCE_DIR/glib" build_prefix="$GMMPROC_GEN_BUILD_DIR/glib" -- cgit v1.2.1