Merge changes from SALOME_3_DS branch

diff --git a/config_files/BOOST-1.30.2.sh b/config_files/BOOST-1.30.2.sh
index bf0c29a896dcc3d00f8140128c0d532e6b18b41a..708d8fbf8248c3b2fc9e49ff947190a03b315cf5 100755 (executable)
--- a/config_files/BOOST-1.30.2.sh
+++ b/config_files/BOOST-1.30.2.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 check_version(){
-ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
-if [ "$ver" = "103002" ]; then
-  return 0
+if [ -n "${BOOSTDIR}" ]; then
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ "$ver" = "103002" ]; then
+       return 0
+    fi
 fi
 return 1;
 }
@@ -21,7 +23,27 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-echo "It is impossible to use native BOOST."
+boostdir="`find_in_path version.hpp /usr/include/boost`"
+if [ -z "${boostdir}" ] ; then
+    boostdir="`find_in_path version.hpp /usr/share/include/boost`"
+fi
+if [ -n "${boostdir}" ] ; then
+    boostdir=`cd ${boostdir}/..; pwd`
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ $ver -ge 103002 ] ;  then 
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export BOOSTDIR=${boostdir}
+##
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       if [ $ver -eq 103002 ] ;  then 
+           return 0
+       else
+           return 2
+       fi
+    fi
+fi
 return 1
 }
 
@@ -42,7 +64,7 @@ print_env
 
 install_binary()
 {
-echo "It impossible to install BOOST from binaries, try install from sources."
+echo "It impossible to install BOOST 1.30.2 from binaries, try to install it from sources."
 return 1
 }
 

diff --git a/config_files/BOOST-1.31.0.sh b/config_files/BOOST-1.31.0.sh
index e6e0f760c4992b89309638dfe4d168842e7c405a..a694d27826e99256074e857e3c77e554f9995fc8 100755 (executable)
--- a/config_files/BOOST-1.31.0.sh
+++ b/config_files/BOOST-1.31.0.sh
@@ -23,7 +23,27 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-echo "It is impossible to use native BOOST 1.31.0."
+boostdir="`find_in_path version.hpp /usr/include/boost`"
+if [ -z "${boostdir}" ] ; then
+    boostdir="`find_in_path version.hpp /usr/share/include/boost`"
+fi
+if [ -n "${boostdir}" ] ; then
+    boostdir=`cd ${boostdir}/..; pwd`
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ $ver -ge 103100 ] ;  then 
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export BOOSTDIR=${boostdir}
+##
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       if [ $ver -eq 103100 ] ;  then 
+           return 0
+       else
+           return 2
+       fi
+    fi
+fi
 return 1
 }
 

diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index 8ce70ae09bf2fb255ab8b13572d84221ff53b37c..3e8b4dae59c97496e0a3e6fb753efd7b6ecdad25 100755 (executable)
--- a/config_files/CAS-6.0.sh
+++ b/config_files/CAS-6.0.sh
@@ -25,7 +25,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${CASROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CASROOT}/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
@@ -49,7 +49,7 @@ if [ $? -eq 0 ] ; then
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=${CASROOT}
 export PATH=\${CASROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${CASROOT}/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat