Replacing xdata 0.5.52 by 0.6.3

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

diff --git a/config_files/BOOST-1.34.1.sh b/config_files/BOOST-1.34.1.sh
index 84ce0e312f8412357d22f090202d18183d540250..c586a0efca8123b0d01a197c8b398210514b6dfa 100755 (executable)
--- a/config_files/BOOST-1.34.1.sh
+++ b/config_files/BOOST-1.34.1.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -26,13 +26,13 @@ print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
-export BOOSTDIR=\${INSTALL_ROOT}/${PRODUCT}
+export BOOSTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export LD_LIBRARY_PATH=\${BOOSTDIR}/lib:\${LD_LIBRARY_PATH}
 export PATH=\${BOOSTDIR}/include:\${PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 print_env_src()
@@ -42,23 +42,23 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
 # nothing to do
 ##
 EOF
-(test -w ${PRODUCT_DIR}_SRC && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_DIR}_SRC)
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 }
 
 try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_DIR}_SRC ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 return $?
 }
 
 install_source()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
 source ${INSTALL_WORK}/$SHRC
 
 # unpack
-check_jb tar xzf ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xzf ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -70,7 +70,13 @@ install_source_and_build()
 install_source
 
 # build sources
-makedir ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+cd ${PRODUCT_SRC_DIR}/tools/jam/src
+
+chmod +w ./Jambase
+mv Jambase Jambase.orig
+sed -e 's/\/usr\/share\/boost-build/\$\(PRODUCT_SRC_DIR\)/g' Jambase.orig > Jambase
 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/BUILD.LOG <<EOF
@@ -81,29 +87,25 @@ python_root=`find_in_path python $PATH`;
 python_root=`cd ${python_root}/..; pwd`
 python_version=`python -c "import sys; print sys.version[:3]"`
 
-cd ${PRODUCT_DIR}_SRC/tools/jam/src
+cd ${PRODUCT_SRC_DIR}/tools/jam/src
 check_job ${PRODUCT_DIR}/BUILD.LOG ./build.sh --debug --with-python=${python_root}
 
-# apply patch to avoid conflicts with Qt signals
-# VSR 07/03/06 : this is no more needed
-#cd ${PRODUCT_DIR}_SRC/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_DIR}_SRC
+cd ${PRODUCT_SRC_DIR}
 
 if test `uname -m` = "x86_64" ; then
 export binfolder=bin.linux.debug
 else
 export binfolder=bin.linuxx86.debug
 fi
-echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam >> ${PRODUCT_DIR}/INSTALL.LOG"
-./tools/jam/src/${binfolder}/bjam --toolset=gcc "-sBOOST_ALL_DYN_LINK=1"         \
-    "-sBUILD=release <runtime-link>dynamic <threading>multi"             \
-    --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_DIR}_SRC                \
-    install >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog
+
+OPTIONS="toolset=gcc variant=release"
+OPTIONS="${OPTIONS} runtime-link=shared threading=multi"
+OPTIONS="${OPTIONS} -sBOOST_ALL_DYN_LINK=1"
+OPTIONS="${OPTIONS} --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_SRC_DIR} install"
+
+echo "`pwd` -> ./tools/jam/src/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG"
+./tools/jam/src/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog
 
 if [ "$?" -ne "0" ] ; then
     cat ${PRODUCT_DIR}/INSTALL.LOG
@@ -131,15 +133,11 @@ for aLib in date_time filesystem prg_exec_monitor python regex signals test_exec
     fi
 done
 
-  if test `uname -m` = "x86_64" ; then
-      cd ${PRODUCT_DIR}; ln -sf lib lib64
-  fi
-#du -sk ${PRODUCT_DIR}_SRC > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR};
 
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
 fi
 
 # to generate environment scripts
@@ -148,10 +146,13 @@ try_preinstalled
 
 install_binary()
 {
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT}
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -160,14 +161,16 @@ try_preinstalled
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
+export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
 export PRODUCT="boost-1.34.1"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
 source ./common.sh
 $PROCEDURE