X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2FMED.sh;h=c7181c1b09b98e9ae8473914c819cd76a2ad8c11;hb=741af97320c9411115221a3cbdf5f84128be907e;hp=90cec12a113db3a77d9cc820a54255f22e18c289;hpb=5d4b10933b2fcbdcce7d19f299d87e55cc45640a;p=tools%2Finstall.git

diff --git a/config_files/MED.sh b/config_files/MED.sh
index 90cec12..c7181c1 100755
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.6"
+VERSION="4.1.1"
 
 check_version(){
 if [ -n "${MED_ROOT_DIR}" ]; then
@@ -24,12 +24,9 @@ if [ -n "${MED_ROOT_DIR}" ]; then
 	fi
     fi
 elif [ -n "${MED_SRC_DIR}" ]; then
-    if [ -f ${MED_SRC_DIR}/configure.in.base ]; then
-	ver=`grep -E "^VERSION=" ${MED_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
-	if [ "$ver" = "${VERSION}" ]; then
-	    return 0
-	fi
-    fi
+  check_salome_src_version MED_SRC_DIR $VERSION
+  if [ $? -eq 0 ] ; then return 0 ; fi
+  return 1
 fi
 return 1
 }
@@ -42,7 +39,7 @@ export LIB_PREFIX=""
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+export MED_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
@@ -80,10 +77,8 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
-if [ $PROCEDURE == "install_source" ]; then
 # to generate environment scripts
-    try_preinstalled
-fi
+try_preinstalled
 }
 
 install_source_and_build()
@@ -92,7 +87,7 @@ install_source_and_build()
 install_source
 
 # build sources
-mkdir -p ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 if [ -e ./build.sh ] ; then
     cp -f ./build.sh ${INSTALL_ROOT}
@@ -122,16 +117,20 @@ install_binary()
 {
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
+
+# create a module directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
 if [ $MED_WITH_GUI == "FALSE" ] ; then
-    check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+    check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 else
-    check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+    check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 fi
 check_jb tar xfz ${SRC_DIR}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export MED_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -147,10 +146,13 @@ export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
-if [ $# == 9 ] ; then MED_WITH_GUI="FALSE" ; else MED_WITH_GUI="TRUE" ; fi
+shift
+MED_WITH_GUI=$9;
+shift
+SINGLE_DIR=$9;
 export PRODUCT="MED_${VERSION}"
 export PRODUCT_SRC="MED_SRC_${VERSION}"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC}
 source ./common.sh
 $PROCEDURE