#
####################################################################################
-VERSION="3.2.6"
+VERSION="4.1.1"
check_version(){
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
}
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}
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()
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}
{
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
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