Merge bug fixes from SALOME_3_DS branch

diff --git a/config_files/HappyDoc-r2_1.sh b/config_files/HappyDoc-r2_1.sh
index ba6d1a0f5db6260411f2f7f16a884301bde8c3f1..03ad524bc42dc86154b395bfbf8200c92f07526a 100755 (executable)
--- a/config_files/HappyDoc-r2_1.sh
+++ b/config_files/HappyDoc-r2_1.sh
@@ -7,7 +7,6 @@ if [ "$?" -ne "0" ]; then
 fi
 happydoc 2&> /dev/null
 if [ "$?" -eq "0" ]; then
-    ver=`happydoc | grep "HappyDoc version 2.1"`  
     ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'`
     if [ "$ver" == "2.1" ]; then
        return 0
@@ -31,6 +30,7 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 try_native(){
 happydoc="`find_in_path happydoc ${PATH}`"
 if [ -n "${happydoc}" ] ; then
+    ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'`
     cat > ${INSTALL_WORK}/try_native.py <<EOF 
 import sys
 try :
@@ -40,10 +40,12 @@ except ImportError, r :
     sys.exit(1)
 EOF
     python ${INSTALL_WORK}/try_native.py
-    if [ $? -eq 0 ] ; then
+    if [ $? -eq 0 ] && [ "$ver" == "2.1" ] ; then
        tmp="${happydoc} ${happydoc} \${PATH} ${PATH}";  
        path=`sort_path ${tmp}`
-       pythonpath="`find_in_path happydocset ${PYTHONPATH}`"
+       pythonpath=`python -c "import happydoclib; print happydoclib.__file__" 2>/dev/null`
+       pythonpath=`dirname $pythonpath`
+       pythonpath=`dirname $pythonpath`
        tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
        pythonpath=`sort_path ${tmp}`
        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 

diff --git a/config_files/Numeric-22.0.sh b/config_files/Numeric-22.0.sh
index a1584c408bbf0415144470f01c6692834c2fb165..3921a1c97fd3c3e2e8d0daa37f77f166412e45d0 100755 (executable)
--- a/config_files/Numeric-22.0.sh
+++ b/config_files/Numeric-22.0.sh
@@ -20,18 +20,25 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    pythonpath="`find_in_path Numeric.py ${PYTHONPATH}`"
-    tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
-    pythonpath=`sort_path ${tmp}`
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+numpath=`python -c "import Numeric; print Numeric.__file__" 2>/dev/null`
+if [ -n "${numpath}" ] ; then
+    numpath=`dirname ${numpath}`
+    ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null | awk -F. '{v=0;for(i=1;i<=NF;i++)v=v*100+$i;print v}'`
+    if [ $ver -ge 2200 ] ; then
+       tmp="${numpath} ${numpath} \${PYTHONPATH} ${PYTHONPATH}";  
+       pythonpath=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONPATH=${pythonpath}
 ##
 EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       if [ $ver -eq 2200 ] ; then
+           return 0
+       else
+           return 2
+       fi
+    fi
 fi
 return 1
 }

diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh
index 57fd1d748bf518125d35efcd463ad3f9ddd7f56f..0f8387b5e678c1e8f59efece350be55c02bbcd6e 100755 (executable)
--- a/config_files/Numeric-23.7.sh
+++ b/config_files/Numeric-23.7.sh
@@ -20,18 +20,25 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    pythonpath="`find_in_path Numeric.py ${PYTHONPATH}`"
-    tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
-    pythonpath=`sort_path ${tmp}`
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+numpath=`python -c "import Numeric; print Numeric.__file__" 2>/dev/null`
+if [ -n "${numpath}" ] ; then
+    numpath=`dirname ${numpath}`
+    ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null | awk -F. '{v=0;for(i=1;i<=NF;i++)v=v*100+$i;print v}'`
+    if [ $ver -ge 2307 ] ; then
+       tmp="${numpath} ${numpath} \${PYTHONPATH} ${PYTHONPATH}";  
+       pythonpath=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONPATH=${pythonpath}
 ##
 EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       if [ $ver -eq 2307 ] ; then
+           return 0
+       else
+           return 2
+       fi
+    fi
 fi
 return 1
 }

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
index a268794c321725416f3c92481fa03726b2aa7886..0f3ccf8df1ccbef9cc919e3614d840654db52600 100755 (executable)
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-4.2.6.sh
@@ -85,9 +85,14 @@ mv -f IO/vtkImageReader.cxx.orig IO/vtkImageReader.cxx
 # get Python and tcl/tk version
 python_version="`python -c 'import sys; print sys.version[:3]'`"
 tcl_version=""
+tcl_includes=""
+tcl_libs=""
 tcldir="`where_tcl`"
 if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
     tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g"`
+    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"`
+    if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
+    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g"`
 fi
     
 VTK_CMAKE_OPTIONS=""
@@ -109,16 +114,17 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a"
 fi
 ### Wrap Tcl settings
-if [ "${tcl_version}" != "" ]; then
+if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
+# suppose that tcl and tk are installed in the same dir
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${TCLHOME}/include"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${TCLHOME}/lib/libtcl${tcl_version}.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtclstub${tcl_version}.a"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${TCLHOME}/include"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk${tcl_version}.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub${tcl_version}.a"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh${tcl_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${tcl_includes}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}"
 fi
 ### if Mesa is pre-installed
 if [ -n "$MESA_HOME" ]; then

diff --git a/config_files/common.sh b/config_files/common.sh
index f8c08cab39794108d112257e480b88e74baa4fa6..9a69683fabf2fb474071bed5de016656f0203f52 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -358,7 +358,7 @@ find_in_path(){
 file=$1;  shift; 
 path=$*
 for i in `echo ${path} | sed -e"s%:% %g"` ; do 
-    ret=`find $i -name $file 2>/dev/null`
+    ret=`find $i -name $file -maxdepth 1 2>/dev/null`
     if [ -n "$ret" ] ; then
        ret=`echo $ret | sed -e"s%/\$file$%%g"`
        echo $ret

diff --git a/config_files/doxygen-1.3.7.sh b/config_files/doxygen-1.3.7.sh
index df290042fb631f2784a811a93d2132108ea287c8..3857ff2eb882b1f577e5ea86348662062deb9dad 100755 (executable)
--- a/config_files/doxygen-1.3.7.sh
+++ b/config_files/doxygen-1.3.7.sh
@@ -65,7 +65,7 @@ check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3.7.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
 # vsr: fix a bug on Mandrake-10.1: wrong qt library reference
-sed -e "s/-lqt/-lqt-mt/g" ./tmake/lib/linux-g++/tmake.conf > ./tmake/lib/linux-g++/tmake.conf.new
+sed -e "s/-lqt$/-lqt-mt/g" ./tmake/lib/linux-g++/tmake.conf > ./tmake/lib/linux-g++/tmake.conf.new
 mv ./tmake/lib/linux-g++/tmake.conf.new ./tmake/lib/linux-g++/tmake.conf
 # vsr: fix bug - configure fails on Red Hat 9 because of incorrect autodetect check for install tool
 # so it is necessary to put it directly

diff --git a/config_files/msg2qm.sh b/config_files/msg2qm.sh
index 42c4f2fb180a22e9ad4ce8f81b2c809770968091..26b8f69155038279498185575f97c1df38aacd8e 100755 (executable)
--- a/config_files/msg2qm.sh
+++ b/config_files/msg2qm.sh
@@ -25,8 +25,7 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 try_native(){
 msg2qmroot="`find_in_path msg2qm ${PATH}`"
 if [ -n "${msg2qmroot}" ] ; then
-    msg2qmroot=`cd ${msg2qmroot}/..; pwd`
-    tmp="\${msg2qmroot} ${MSG2QM_ROOT} \${PATH} ${PATH}";  
+    tmp="\${MSG2QM_ROOT} ${msg2qmroot} \${PATH} ${PATH}";  
     path=`sort_path ${tmp}`
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM

diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh
index ccafacf5192b2447174078267ab2f853a6b2fe25..05aa4da4629111749f23c9e4fdb68b40f6fdd289 100755 (executable)
--- a/config_files/sip-4.1.sh
+++ b/config_files/sip-4.1.sh
@@ -40,7 +40,7 @@ if [ -n "${sipdir}" ] ; then
     if [ -n "${sippython}" ]; then
         tmp="${sipdir} ${sipdir} \${PATH} ${PATH}";
         path=`sort_path ${tmp}`
-        tmp="${sipdir} ${sipdir} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";
+        tmp="${sippython} ${sippython} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";
         ld_library_path=`sort_path ${tmp}`
         tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}";
         pythonpath=`sort_path ${tmp}`

diff --git a/config_files/tcltk-8.3.3.sh b/config_files/tcltk-8.3.3.sh
index 74c7ffab32b99ec7cc7ab0ed574d9017ed8ee3d7..64aaddbb97ba8cb1f45babe12567a8cb74fee00c 100755 (executable)
--- a/config_files/tcltk-8.3.3.sh
+++ b/config_files/tcltk-8.3.3.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
+VERSION="8.3"
+
 check_version()
 {
-VERSION="8.3"
 if [ -z "$TCLHOME" ]; then
    echo "TCLHOME doesn't set"
    return 1
@@ -46,7 +47,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.3 \${TCLHOME}/lib/tk8.3 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -70,7 +71,7 @@ if [ -n "${tclhome}" ] ; then
 export TCLHOME=${tclhome}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.3 \${TCLHOME}/lib/tk8.3 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
     (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/tcltk-8.4.5.sh b/config_files/tcltk-8.4.5.sh
index 934b879222bd6cd0930843c7d6867ed05703a292..14d0cefe973868f2bc16e315d146471ce1e07ec9 100755 (executable)
--- a/config_files/tcltk-8.4.5.sh
+++ b/config_files/tcltk-8.4.5.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 
+VERSION="8.4"
+
 check_version()
 {
-VERSION="8.4"
 if [ -z "$TCLHOME" ]; then
    echo "TCLHOME doesn't set"
    return 1
@@ -46,7 +47,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export TCLHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${TCLHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -70,7 +71,7 @@ if [ -n "${tclhome}" ] ; then
 export TCLHOME=${tclhome}
 export PATH=${path}
 export LD_LIBRARY_PATH=${ld_library_path}
-export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl${VERSION} \${TCLHOME}/lib/tk${VERSION} \${TCLLIBPATH}"
 ##
 EOF
     (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})