From a46bf3eeccaa266fcb9d56432de5e7a083ac1bb2 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 21 Oct 2009 07:42:04 +0000 Subject: [PATCH] *** empty log message *** --- config_Debian_4.0_64bit.xml | 6 +++--- config_files/MULTIPR.sh | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index eb94512..bc2cab0 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -224,7 +224,7 @@ description="Partitioning/decimation module for the SALOME platform"> @@ -450,7 +450,7 @@ + description="Generic batch management library"> - boost @@ -561,6 +560,7 @@ Graphviz docutils libxml2 + libBatch boost diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh index 0e9e116..eeec798 100755 --- a/config_files/MULTIPR.sh +++ b/config_files/MULTIPR.sh @@ -14,8 +14,9 @@ check_version(){ if [ -n "${MULTIPR_ROOT_DIR}" ]; then - if [ -f ${MULTIPR_ROOT_DIR}/bin/salome/VERSION ]; then - ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` + check_lib_version VERSION ${MULTIPR_ROOT_DIR}/bin/salome + if [ "$?" -eq "0" ]; then + ver=`cat ${MULTIPR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` if [ "$ver" = "${SALOME_VERSION}" ]; then return 0 fi @@ -66,7 +67,7 @@ install_source() { make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src source ${INSTALL_WORK}/$SHRC - +# unpack check_jb tar xfz ${SOURCE_DIR}/MULTIPRsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT} # to generate environment scripts -- 2.39.2