X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FATOMSOLV.sh;h=590d2eed0979042cae45faef3e120a8832e6b472;hb=ee2af37feace0ee0ddc554d0cf3feba51e078616;hp=467480f910cb5dcb159796889c7afe9b50e2e555;hpb=667b27408fe8c9e2e077135239386383a790984c;p=tools%2Finstall.git

diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index 467480f..590d2ee 100755
--- a/config_files/ATOMSOLV.sh
+++ b/config_files/ATOMSOLV.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2015 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -16,8 +16,8 @@ check_version(){
 if [ -n "${ATOMSOLV_ROOT_DIR}" ]; then
     check_lib_version VERSION ${ATOMSOLV_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
-	ver=`cat ${ATOMSOLV_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${SALOME_VERSION}" ]; then
+	ver=`head -n1 ${ATOMSOLV_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+	if [ "${ver}" = "${SALOME_VERSION}" ]; then
 	    return 0
 	fi
     fi
@@ -31,10 +31,10 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
 export ATOMSOLV_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=\${ATOMSOLV_ROOT_DIR}/bin/salome:\${PATH}
     export LD_LIBRARY_PATH=\${ATOMSOLV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
     export PYTHONPATH=\${ATOMSOLV_ROOT_DIR}/bin/salome:\${ATOMSOLV_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
@@ -48,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 ATOMSOLV_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
 ##
 EOF
@@ -66,7 +66,7 @@ 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}/ATOMSOLVsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 
@@ -82,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 ATOMSOLV
+check_jb ./build.sh -d -p ${INST_ROOT} ATOMSOLV
 
-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}/"ATOMSOLV_BUILD" && rm -fr ${INST_ROOT}/"ATOMSOLV_BUILD"
 fi
@@ -105,7 +105,7 @@ 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}
@@ -116,6 +116,9 @@ check_jb tar xfz ${SRC_DIR}/ATOMSOLVsourcesV${SALOME_VERSION}.tar.gz -C ${INST_R
 # modify all *.la files
 export ATOMSOLV_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVTargets-release.cmake 
+sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export ATOMSOLV_ROOT_DIR=.*%export ATOMSOLV_ROOT_DIR=${ATOMSOLV_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runATOMSOLV
 
 # to generate environment scripts
 try_preinstalled
@@ -135,9 +138,9 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9;
-if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
+if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi
 export PRODUCT="ATOMSOLV_${SALOME_VERSION}"
 export PRODUCT_SRC="ATOMSOLV_SRC_${SALOME_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-$PROCEDURE 
+${PROCEDURE}