Fix pb of previous integration

[tools/install.git] / config_files / BOOST-1.31.0.sh

diff --git a/config_files/BOOST-1.31.0.sh b/config_files/BOOST-1.31.0.sh
index 322359b0493876b5e2ac34b4d5fbec61ca2b3bfa..5d61feefba93bd6ccd1b96c64b05df84043e3e0a 100755 (executable)
--- a/config_files/BOOST-1.31.0.sh
+++ b/config_files/BOOST-1.31.0.sh
@@ -1,8 +1,20 @@
-#!/bin/sh
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : BOOST-1.31.0.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2006 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
 
 check_version(){
-if [ -n "${BOOSTDIR}" ]; then
-    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+if [ -n "${BOOSTDIR}" ] && [ -f ${BOOSTDIR}/include/boost/version.hpp ] ; then
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/include/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
     if [ "$ver" = "103100" ]; then
        return 0
     fi
@@ -24,17 +36,14 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-boostdir="`find_in_path version.hpp /usr/include/boost`"
-if [ -z "${boostdir}" ] ; then
-    boostdir="`find_in_path version.hpp /usr/share/include/boost`"
-fi
+boostdir="`find_in_path version.hpp /usr/include/boost:/usr/share/include/boost`"
 if [ -n "${boostdir}" ] ; then
-    boostdir=`cd ${boostdir}/..; pwd`
+    boostdir=`cd ${boostdir}/../..; pwd`
     ls ${boostdir}/lib/libboost_thread* &> /dev/null
     if [ "$?" -ne "0" ] ; then 
        return 1
     fi
-    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/include/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 
@@ -77,10 +86,11 @@ cd ${PRODUCT_WORK}/tools/build/jam_src
 check_job ${PRODUCT_DIR}/BUILD.LOG ./build.sh
 
 # apply patch to avoid conflicts with Qt signals
-cd ${PRODUCT_WORK}/boost/signals/detail
-sed -e "s%#  define BOOST_SIGNALS_NAMESPACE signals%#  define BOOST_SIGNALS_NAMESPACE bsignals%g" \
-    signals_common.hpp > signals_common.hpp.orig
-mv -f signals_common.hpp.orig signals_common.hpp
+# VSR 07/03/06 : this is no more needed
+#cd ${PRODUCT_WORK}/boost/signals/detail
+#sed -e "s%#  define BOOST_SIGNALS_NAMESPACE signals%#  define BOOST_SIGNALS_NAMESPACE bsignals%g" \
+#    signals_common.hpp > signals_common.hpp.orig
+#mv -f signals_common.hpp.orig signals_common.hpp
 
 # install
 cd ${PRODUCT_WORK}
@@ -114,7 +124,7 @@ for aLib in date_time filesystem prg_exec_monitor python regex signals test_exec
     fi
 done
 
-du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
 
 print_env