Update patch for ParaView 4.1: add fix for issue 0022593: [CEA 1175] PARAVIS segmenta...

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

diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index b2bda7301eb1c304ede80db8e47e0c21166de646..b0e10601a1030a71d0392ca0b950cef82184c8b2 100755 (executable)
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -1,30 +1,28 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : COMPONENT_BIN.sh
+#  File      : COMPONENT.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-2007 CEA
+#  Copyright : 2002-2014 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-VERSION="5.0.0"
-
 check_version(){
 if [ -n "${COMPONENT_ROOT_DIR}" ]; then
     check_lib_version VERSION ${COMPONENT_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
-       ver=`cat ${COMPONENT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "${VERSION}" ]; then
+       ver=`head -n1 ${COMPONENT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+       if [ "${ver}" = "${SALOME_VERSION}" ]; then
            return 0
        fi
     fi
 elif [ -n "${COMPONENT_SRC_DIR}" ]; then
-  check_salome_src_version COMPONENT_SRC_DIR $VERSION
+  check_salome_src_version COMPONENT_SRC_DIR
   if [ $? -eq 0 ] ; then return 0 ; fi
   return 1
 fi
@@ -32,23 +30,14 @@ return 1
 }
 
 print_env_bin(){
-
-if [ `uname -m` = "x86_64" ] && [ -d ${PRODUCT_DIR}/lib64 ] ; then 
-    LIB_PREFIX=64
-elif [ -d ${PRODUCT_DIR}/lib ] ; then 
-    LIB_PREFIX=""
-else 
-    LIB_PREFIX=64
-fi
-
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export COMPONENT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
-  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
     export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
-    export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
-    export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${COMPONENT_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+    export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
   fi
 fi
 ##
@@ -59,7 +48,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}
 export COMPONENT_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -77,9 +66,9 @@ return $?
 install_source()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
-check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV${VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # to generate environment scripts
 try_preinstalled
@@ -93,18 +82,18 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-if [ -e ./build.sh ] ; then
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
     cp -f ./build.sh ${INST_ROOT}
 fi
 
 CUR_DIR=`pwd`
 cd ${INST_ROOT}
-check_jb build.sh -o -b -d -v 0 -p $INST_ROOT COMPONENT
+check_jb ./build.sh -d -p ${INST_ROOT} COMPONENT
 
-cd $CUR_DIR
+cd ${CUR_DIR}
 
 # remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
     test -d ${INST_ROOT}/"COMPONENT_BUILD" && rm -fr ${INST_ROOT}/"COMPONENT_BUILD"
 fi
@@ -116,22 +105,26 @@ try_preinstalled
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a module directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
-check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
 # modify all *.la files
 export COMPONENT_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCOMPONENTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
 }
 
+source ./common.sh
+
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
@@ -144,9 +137,9 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
-export PRODUCT="COMPONENT_${VERSION}"
-export PRODUCT_SRC="COMPONENT_SRC_${VERSION}"
+if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi
+export PRODUCT="COMPONENT_${SALOME_VERSION}"
+export PRODUCT_SRC="COMPONENT_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-source ./common.sh
-$PROCEDURE 
+${PROCEDURE}