[gtkmm] gen_scripts: Do not require a change to the PATH environment variable.

[Murray Cumming <murrayc src gnome org>]

commit 7c2907b9957769a09d8197ae2f348b68c7f3bc6e
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jun 14 12:21:10 2012 +0200

    gen_scripts: Do not require a change to the PATH environment variable.
    
    	* tools/gen_scripts/gdk_generate_docs.sh:
    	* tools/gen_scripts/gdk_generate_enums.sh:
    	* tools/gen_scripts/gdk_generate_methods.sh:
    	* tools/gen_scripts/gtk_generate_docs.sh:
    	* tools/gen_scripts/gtk_generate_enums.sh:
    	* tools/gen_scripts/gtk_generate_methods.sh: Remove the need to change
    	the PATH as I did in the glibmm gen_scripts.

 ChangeLog                                 |   12 ++++++++++++
 tools/gen_scripts/gdk_generate_docs.sh    |   13 ++++++-------
 tools/gen_scripts/gdk_generate_enums.sh   |   13 ++++++-------
 tools/gen_scripts/gdk_generate_methods.sh |   13 ++++++-------
 tools/gen_scripts/gtk_generate_docs.sh    |   13 ++++++-------
 tools/gen_scripts/gtk_generate_enums.sh   |   13 ++++++-------
 tools/gen_scripts/gtk_generate_methods.sh |   13 ++++++-------
 7 files changed, 48 insertions(+), 42 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 718f5ca..5c2e5a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-06-14  Murray Cumming  <murrayc murrayc com>
+
+	gen_scripts: Do not require a change to the PATH environment variable.
+
+	* tools/gen_scripts/gdk_generate_docs.sh:
+	* tools/gen_scripts/gdk_generate_enums.sh:
+	* tools/gen_scripts/gdk_generate_methods.sh:
+	* tools/gen_scripts/gtk_generate_docs.sh:
+	* tools/gen_scripts/gtk_generate_enums.sh:
+	* tools/gen_scripts/gtk_generate_methods.sh: Remove the need to change
+	the PATH as I did in the glibmm gen_scripts.
+
 2012-06-12  Murray Cumming  <murrayc murrayc com>
 
 	Application: run(): Do not show the window until activation.
diff --git a/tools/gen_scripts/gdk_generate_docs.sh b/tools/gen_scripts/gdk_generate_docs.sh
index 71b127f..a0b0f7c 100755
--- a/tools/gen_scripts/gdk_generate_docs.sh
+++ b/tools/gen_scripts/gdk_generate_docs.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Note that docextract_to_xml.py should be in PATH for this script to work and
+# Note that 
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
-# jhbuild sources.  The script assumes that it resides in the tools/gen_scripts
-# directory and the XML file will be placed in gdk/src.
+# jhbuild sources. The XML files will be placed in gdk/src.
 
-if [ -z "$JHBUILD_SOURCES" -o ! -x "`which docextract_to_xml.py`" ]; then
-  echo -e "JHBUILD_SOURCES must contain path to jhbuild sources and \
-docextract_to_xml.py\nneeds to be executable and in PATH."
+if [ -z "$JHBUILD_SOURCES" ]; then
+  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources."
   exit 1;
 fi
 
@@ -19,4 +17,5 @@ for dir in "$PREFIX"/gtk+/gdk; do
   PARAMS="$PARAMS -s $dir"
 done
 
-docextract_to_xml.py $PARAMS > "$OUT_DIR"/gdk_docs.xml
+DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py"
+$DOCEXTRACT_TO_XML_PY $PARAMS > "$OUT_DIR"/gdk_docs.xml
diff --git a/tools/gen_scripts/gdk_generate_enums.sh b/tools/gen_scripts/gdk_generate_enums.sh
index 281f40a..d7aae95 100755
--- a/tools/gen_scripts/gdk_generate_enums.sh
+++ b/tools/gen_scripts/gdk_generate_enums.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Note that enum.pl should be in PATH for this script to work and
+# Note that 
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
-# jhbuild sources.  The script assumes that it resides in the tools/gen_scripts
-# directory and the defs files will be placed in gdk/src.
+# jhbuild sources. The defs files will be placed in gdk/src.
 
-if [ -z "$JHBUILD_SOURCES" -o ! -x "`which enum.pl`" ]; then
-  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \
-enum.pl\nneeds to be executable and in PATH."
+if [ -z "$JHBUILD_SOURCES" ]; then
+  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources."
   exit 1;
 fi
 
@@ -15,4 +13,5 @@ PREFIX="$JHBUILD_SOURCES/gtk+"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gdk/src"
 
-enum.pl "$PREFIX"/gdk/*.h > "$OUT_DIR"/gdk_enums.defs
+ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
+$ENUM_PL "$PREFIX"/gdk/*.h > "$OUT_DIR"/gdk_enums.defs
diff --git a/tools/gen_scripts/gdk_generate_methods.sh b/tools/gen_scripts/gdk_generate_methods.sh
index 492da79..d937d0e 100755
--- a/tools/gen_scripts/gdk_generate_methods.sh
+++ b/tools/gen_scripts/gdk_generate_methods.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Note that h2def.py should be in PATH for this script to work and
+# Note that 
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
-# jhbuild sources.  The script assumes that it resides in the tools/gen_scripts
-# directory and the defs files will be placed in gdk/src.
+# jhbuild sources. The defs files will be placed in gdk/src.
 
-if [ -z "$JHBUILD_SOURCES" -o ! -x "`which h2def.py`" ]; then
-  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \
-h2def.py\nneeds to be executable and in PATH."
+if [ -z "$JHBUILD_SOURCES" ]; then
+  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources."
   exit 1;
 fi
 
@@ -15,4 +13,5 @@ PREFIX="$JHBUILD_SOURCES/gtk+"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gdk/src"
 
-h2def.py "$PREFIX"/gdk/*.h > "$OUT_DIR"/gdk_methods.defs
+H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py"
+$H2DEF_PY "$PREFIX"/gdk/*.h > "$OUT_DIR"/gdk_methods.defs
diff --git a/tools/gen_scripts/gtk_generate_docs.sh b/tools/gen_scripts/gtk_generate_docs.sh
index 0f556e6..d49b611 100755
--- a/tools/gen_scripts/gtk_generate_docs.sh
+++ b/tools/gen_scripts/gtk_generate_docs.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Note that docextract_to_xml.py should be in PATH for this script to work and
+# Note that 
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
-# jhbuild sources.  The script assumes that it resides in the tools/gen_scripts
-# directory and the XML file will be placed in gtk/src.
+# jhbuild sources. The XML files will be placed in gtk/src.
 
-if [ -z "$JHBUILD_SOURCES" -o ! -x "`which docextract_to_xml.py`" ]; then
-  echo -e "JHBUILD_SOURCES must contain path to jhbuild sources and \
-docextract_to_xml.py\nneeds to be executable and in PATH."
+if [ -z "$JHBUILD_SOURCES" ]; then
+  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources."
   exit 1;
 fi
 
@@ -19,4 +17,5 @@ for dir in "$PREFIX"/gtk+/gtk; do
   PARAMS="$PARAMS -s $dir"
 done
 
-docextract_to_xml.py $PARAMS > "$OUT_DIR/gtk_docs.xml"
+DOCEXTRACT_TO_XML_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/docextract_to_xml.py"
+$DOCEXTRACT_TO_XML_PY $PARAMS > "$OUT_DIR/gtk_docs.xml"
diff --git a/tools/gen_scripts/gtk_generate_enums.sh b/tools/gen_scripts/gtk_generate_enums.sh
index f8f2f3c..d4c0a66 100755
--- a/tools/gen_scripts/gtk_generate_enums.sh
+++ b/tools/gen_scripts/gtk_generate_enums.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Note that enum.pl should be in PATH for this script to work and
+# Note that 
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
-# jhbuild sources.  The script assumes that it resides in the tools/gen_scripts
-# directory and the defs files will be placed in gtk/src.
+# jhbuild sources. The defs files will be placed in gtk/src.
 
-if [ -z "$JHBUILD_SOURCES" -o ! -x "`which enum.pl`" ]; then
-  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \
-enum.pl\nneeds to be executable and in PATH."
+if [ -z "$JHBUILD_SOURCES" ]; then
+  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources."
   exit 1;
 fi
 
@@ -15,4 +13,5 @@ PREFIX="$JHBUILD_SOURCES/gtk+"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"
 
-enum.pl "$PREFIX"/gtk/*.h "$PREFIX"/gtk/deprecated/*.h > "$OUT_DIR"/gtk_enums.defs
+ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
+$ENUM_PL "$PREFIX"/gtk/*.h "$PREFIX"/gtk/deprecated/*.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 c5b007f..ad272c3 100755
--- a/tools/gen_scripts/gtk_generate_methods.sh
+++ b/tools/gen_scripts/gtk_generate_methods.sh
@@ -1,13 +1,11 @@
 #!/bin/bash
 
-# Note that h2def.py should be in PATH for this script to work and
+# Note that 
 # JHBUILD_SOURCES should be defined to contain the path to the root of the
-# jhbuild sources.  The script assumes that it resides in the tools/gen_scripts
-# directory and the defs files will be placed in gtk/src.
+# jhbuild sources. The defs files will be placed in gtk/src.
 
-if [ -z "$JHBUILD_SOURCES" -o ! -x "`which h2def.py`" ]; then
-  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources and \
-h2def.py\nneeds to be executable and in PATH."
+if [ -z "$JHBUILD_SOURCES" ]; then
+  echo -e "JHBUILD_SOURCES must contain the path to the jhbuild sources."
   exit 1;
 fi
 
@@ -15,4 +13,5 @@ PREFIX="$JHBUILD_SOURCES/gtk+"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gtk/src"
 
-h2def.py "$PREFIX"/gtk/*.h "$PREFIX"/gtk/deprecated/*.h > "$OUT_DIR"/gtk_methods.defs
+H2DEF_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/h2def.py"
+$H2DEF_PY "$PREFIX"/gtk/*.h "$PREFIX"/gtk/deprecated/*.h > "$OUT_DIR"/gtk_methods.defs