Integrate patch for v5.1.2 from Nicolas CROUZET

diff --git a/scripts/hxx2salome b/scripts/hxx2salome
index 0dce7f8dd5cbe577e68e1c2d1c9121fc2edcd50a..261677a556cacd59eef258108dd5d966aabdc112 100755 (executable)
--- a/scripts/hxx2salome
+++ b/scripts/hxx2salome
@@ -427,9 +427,16 @@ SHELL_EXT=sh
 do_compile=0
 do_launch=0
 make_gui=0
- #
+#
 welcome # print some welcome info
 #
+gene_dir=`dirname $0`
+if [ ! -f ${gene_dir}/parse3.awk -o ! -f ${gene_dir}/template_src.tgz ] # final check
+then
+    echo -e "\nError : scripts parse3.awk or template_src.tgz not present in hxx2salome directory  : $gene_dir"
+    usage
+fi
+#
 while getopts "cs:e:h:lg" Option
 do
    case $Option in
@@ -496,41 +503,6 @@ else
        fi
    fi
 fi
-
-# look up hxx2salome scripts
-#   - first search in directory ${HXX2SALOME_ROOT_DIR} (if the variable is defined)
-#   - then search in directory ${HXX2SALOME_ROOT_DIR}/bin
-#   - finally seach locally.
-#
-if [ ${HXX2SALOME_ROOT_DIR} ] && [ -d ${HXX2SALOME_ROOT_DIR} ]
-then
-    echo "    HXX2SALOME_ROOT_DIR variable is defined : ${HXX2SALOME_ROOT_DIR}  => we look up hxx2salome scripts inside"
-    if [ -f ${HXX2SALOME_ROOT_DIR}/parse1.awk -a  -f ${HXX2SALOME_ROOT_DIR}/parse2.awk ] # check if script are found in ${HXX2SALOME_ROOT_DIR}
-    then
-       gene_dir=${HXX2SALOME_ROOT_DIR}
-    elif [ -f ${HXX2SALOME_ROOT_DIR}/bin/parse1.awk -a  -f ${HXX2SALOME_ROOT_DIR}/bin/parse2.awk ] # else check /bin directory
-    then
-       gene_dir=${HXX2SALOME_ROOT_DIR}/bin
-    else
-       echo -e "\nError : Variable HXX2SALOME_ROOT_DIR not correctly set"
-       usage
-    fi
-else
-    echo "HXX2SALOME_ROOT_DIR directory not set  => we look up hxx2salome scripts locally"
-    if [  -f parse1.awk -a  -f parse2.awk ] # check if script are found locally
-    then
-       gene_dir=`pwd` # case where hxx2salome was launched from HXX2SALOME directory
-    else
-       echo -e "\nError : Variable HXX2SALOME_ROOT_DIR is not set, and hxx2salome didn't find his scripts locally"
-       usage
-    fi
-fi
-echo "    hxx2salome directory found : $gene_dir"
-if [ ! -f ${gene_dir}/parse3.awk -o ! -f ${gene_dir}/template_src.tgz ] # final check
-then
-    echo -e "\nError : scripts parse3.awk or template_src.tgz not present in hxx2salome directory  : $gene_dir"
-    usage
-fi
 #
 # get class name
 #

diff --git a/scripts/template_src.tgz b/scripts/template_src.tgz
index 2bdbea0ad9460581b0d096bfdbd4d902b1ab99e8..a8b7b24755af89fdc96cfa3e6bb91a56073bf682 100644 (file)
Binary files a/scripts/template_src.tgz and b/scripts/template_src.tgz differ