Copyright update

[tools/install.git] / config_files / tbb.sh

diff --git a/config_files/tbb.sh b/config_files/tbb.sh
index cd048ea931fdf55a2988aa08445aead1b82b827f..13765de8f1c12604ec8209058b8431c8b0609eaf 100755 (executable)
--- a/config_files/tbb.sh
+++ b/config_files/tbb.sh
@@ -6,19 +6,19 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2013 CEA
+#  Copyright : 2002-2015 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-TBB_VERSION=30_018oss
+VERSION_TBB=30_018oss
 TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
 
 if test `uname -m` = "x86_64" ; then
-    export TBBMODE="intel64/$TBBKERNEL"
+    export TBBMODE="intel64/${TBBKERNEL}"
 else
-    export TBBMODE="ia32/$TBBKERNEL"
+    export TBBMODE="ia32/${TBBKERNEL}"
 fi
 
 check_version(){
@@ -29,10 +29,10 @@ return 0
 print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export TBBHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${TBBHOME}/bin/$TBBMODE:\$PATH 
-export LD_LIBRARY_PATH=\${TBBHOME}/lib/$TBBMODE:\${LD_LIBRARY_PATH}
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export TBB_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${TBB_ROOT_DIR}/bin/${TBBMODE}:\${PATH} 
+export LD_LIBRARY_PATH=\${TBB_ROOT_DIR}/lib/${TBBMODE}:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -42,7 +42,7 @@ make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}
 print_env_src()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
 # nothing to do
 ##
 EOF
@@ -64,19 +64,24 @@ echo "It's impossible to install ${PRODUCT} from sources"
 install_source_and_build()
 {
 install_binary
+
+if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
+    echo "0" > ${INST_ROOT}/${PRODUCT_TYPE}.src.size
+    du -sk ${PRODUCT_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.bin.size
+    cp ${INST_ROOT}/${PRODUCT_TYPE}.bin.size ${INST_ROOT}/${PRODUCT_TYPE}.build.size
+fi
 }
 
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a product directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${BIN_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
-
 # to generate environment script
 try_preinstalled
 }
@@ -92,10 +97,10 @@ SRC_DIR=$8;
 REMOVE_SRC_TMP=$9;
 shift
 BIN_DIR=$9;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="tbb${TBB_VERSION}"
+test $# = 10 && shift && SINGLE_DIR=$9
+export PRODUCT="tbb-${VERSION_TBB}"
 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 
+${PROCEDURE}