From: inv <inv@opencascade.com>
Date: Tue, 3 Apr 2012 14:47:40 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: med 3.0.4 -> 3.0.5
X-Git-Tag: V6_5_0b1~57
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eb2e06cd0fcd4c9332f4d2df04cc50d8e443939e;p=tools%2Finstall.git

SALOME 6.5.0 preparation: med 3.0.4 -> 3.0.5
---

diff --git a/config_files/med-3.0.4.sh b/config_files/med-3.0.4.sh
deleted file mode 100755
index f834fa2..0000000
--- a/config_files/med-3.0.4.sh
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : med-3.0.4.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-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-MEDVERSION=3.0.4
-
-check_version()
-{
-if [ -z "$MED2HOME" ]; then
-   #echo "MED2HOME doesn't set"
-   return 1
-fi
-check_lib_version libmed.so.1.1.2 ${MED2HOME}/lib
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export MED2HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${MED2HOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${MED2HOME}/lib:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-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
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-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}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-cd ${PRODUCT_SRC_DIR}
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-    if test `uname -m` = "x86_64" ; then
-	    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2 -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-	    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2 -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
-    else
-	echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2' >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-	./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
-    fi
-    if [ "$?" -ne "0" ] ; then
-	cat ${PRODUCT_DIR}/CONFIGURE.LOG
-	cat ${PRODUCT_SRC_DIR}/errlog >&2
-	cat ${PRODUCT_SRC_DIR}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG
-	exit 1
-    fi
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-
-cd ${PRODUCT_DIR}/lib
-
-sed -e "s%\(.*\)\([[:space:]].*-L.*/med-[0-9]\.[0-9]\.[0-9]_SRC/src[[:space:]]\)\(.*\)%\1 \3%g" libmedimport.la > libmedimport.la.new
-mv -f libmedimport.la.new libmedimport.la
-
-chmod 755 libmedimport.la
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
-
-### modify libmed.la libmedC.la files to correct direct path to hdf5 library
-### also modify libmed.la and libmedC.la files to correct direct path to med libraries
-### no need to do this for sources installation because 'make install' does it!
-cd ${PRODUCT_DIR}/lib
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmed.la > libmed.la.new
-mv -f libmed.la.new libmed.la
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedC.la > libmedC.la.new
-mv -f libmedC.la.new libmedC.la
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedimport.la > libmedimport.la.new
-mv -f libmedimport.la.new libmedimport.la
-
-tmp=""
-if [ -n "${HDF5HOME}" ]; then
-    tmp="-L${HDF5HOME}/lib"
-fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
-mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
-mv -f libmedC.la.new libmedC.la
-
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedimport.la > libmedimport.la.new
-mv -f libmedimport.la.new libmedimport.la
-
-sed -e "s%\(.*\)\([[:space:]].*/med-[0-9]\.[0-9]\.[0-9]/lib/libmed.la[[:space:]]\)\(.*\)%\1 ${PRODUCT_DIR}/lib/libmed.la \3%g" libmedimport.la > libmedimport.la.new
-mv -f libmedimport.la.new libmedimport.la
-
-sed -e "s%\(.*\)\([[:space:]].*-L.*/med-[0-9]\.[0-9]\.[0-9]_SRC/src[[:space:]]\)\(.*\)%\1 \3%g" libmedimport.la > libmedimport.la.new
-mv -f libmedimport.la.new libmedimport.la
-
-chmod 755 libmed.la
-chmod 755 libmedC.la
-chmod 755 libmedimport.la
-
-### modify scripts to correct installation path
-cd ${PRODUCT_DIR}/bin
-sed -e "s%set cmd \".*/bin/mdump\"%set cmd \"${PRODUCT_DIR}/bin/mdump\"%g" xmdump > _xmdump
-mv _xmdump xmdump
-chmod a+x xmdump
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-shift
-SINGLE_DIR=$9
-export PRODUCT="med-${MEDVERSION}"
-export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/med.sh b/config_files/med.sh
new file mode 100755
index 0000000..ef5bd0a
--- /dev/null
+++ b/config_files/med.sh
@@ -0,0 +1,176 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : med.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-2012 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# med library version
+#
+MED_VERSION=3.0.5
+
+check_version()
+{
+if [ -z "$MED2HOME" ]; then
+   #echo "MED2HOME doesn't set"
+   return 1
+fi
+check_lib_version libmed.so.1.1.2 ${MED2HOME}/lib
+if [ "$?" -eq "0" ]; then
+   #echo "The product ${PRODUCT} has been already installed on yours system"
+   return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export MED2HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${MED2HOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${MED2HOME}/lib:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+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
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+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}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+if test `uname -m` = "x86_64" ; then
+    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2 -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2 -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
+else
+    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2' >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
+fi
+if [ "$?" -ne "0" ] ; then
+    cat ${PRODUCT_DIR}/CONFIGURE.LOG
+    cat ${PRODUCT_SRC_DIR}/errlog >&2
+    cat ${PRODUCT_SRC_DIR}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG
+    exit 1
+fi
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+
+cd ${PRODUCT_DIR}/lib
+
+### patch badly created libmedimport.la
+### this pb should be fixed in med 3.0.5 or newer version
+sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g" libmedimport.la
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+### modify *.la files to correct direct path to hdf5 library and to med library
+cd ${PRODUCT_DIR}/lib
+
+tmp=""
+if [ -n "${HDF5HOME}" ]; then
+    tmp="-L${HDF5HOME}/lib"
+fi
+for fl in libmed.la libmedC.la libmedimport.la ; do
+    sed -i "s%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" ${fl}
+    sed -i "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" ${fl}
+    sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g;s%\(.*\)\([[:space:]].*libmed.la\)\(.*\)%\1 ${PRODUCT_DIR}/lib/libmed.la \3%g" ${fl}
+done
+
+### modify scripts to correct installation path
+### this pb should be fixed in med 3.0.5 or newer version
+cd ${PRODUCT_DIR}/bin
+for fl in xmdump xmdump3 ; do
+    if [ -f ${fl} ] ; then
+        sed -i "s%set cmd \".*/bin/mdump\"%set cmd \"${PRODUCT_DIR}/bin/mdump\"%g;s%#\!.*wish -f%#\!/usr/bin/env wish%g" ${fl}
+    fi
+done
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+shift
+SINGLE_DIR=$9
+export PRODUCT="med-${MED_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE