From: maintenance team Date: Mon, 27 Oct 2008 10:57:06 +0000 (+0000) Subject: Replacing med-2.3.4 by med-2.3.5 X-Git-Tag: before_merging_with_4X~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0ccbbd015675a7ebd4e496e657feddc184734bea;p=tools%2Finstall.git Replacing med-2.3.4 by med-2.3.5 --- diff --git a/config.xml b/config.xml index 6b3bbc8..1863f45 100644 --- a/config.xml +++ b/config.xml @@ -2913,10 +2913,10 @@ installdiskspace="8050,6445,27102" script="med-2.3.3.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> + script="med-2.3.5.sh"/> ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < /dev/null - if [ $? == 0 ] ; then is_mandriva2006=1 ; fi - grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2007=1 ; fi - grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2008=1 ; fi - grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian40=1 ; fi - grep -e "Fedora Core release 4" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_fedora4=1 ; fi - grep -e "Fedora Core release 6" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_fedora6=1 ; fi -fi - -chmod +w ./Makefile.am -mv Makefile.am Makefile.am.orig -sed -e 's/include src tests tools doc/include src tools doc/g' Makefile.am.orig > Makefile.am - -if [ $is_mandriva2006 == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora4 == 1 ] || [ $is_fedora6 == 1 ] || [ $is_debian40 == 1 ] ; then - if test `uname -m` = "x86_64" ; then - echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" - ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog - else - echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' >> ${PRODUCT_DIR}/CONFIGURE.LOG" - ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" >> ${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 -else - check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} -fi - -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG < 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 -sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedimportcxx.la > libmedimportcxx.la.new -mv -f libmedimportcxx.la.new libmedimportcxx.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:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedimportcxx.la > libmedimportcxx.la.new -mv -f libmedimportcxx.la.new libmedimportcxx.la - -chmod 755 libmed.la -chmod 755 libmedC.la -chmod 755 libmedimport.la -chmod 755 libmedimportcxx.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-2.3.4" -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-2.3.5.sh b/config_files/med-2.3.5.sh new file mode 100755 index 0000000..d57cbd6 --- /dev/null +++ b/config_files/med-2.3.5.sh @@ -0,0 +1,222 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : med-2.3.5.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. +# +#################################################################################### + +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 < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < /dev/null + if [ $? == 0 ] ; then is_mandriva2006=1 ; fi + grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_mandriva2007=1 ; fi + grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_mandriva2008=1 ; fi + grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_debian40=1 ; fi + grep -e "Fedora Core release 4" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_fedora4=1 ; fi + grep -e "Fedora Core release 6" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_fedora6=1 ; fi +fi + +if [ $is_mandriva2006 == 1 ] ; then +chmod +w ./Makefile.am +mv Makefile.am Makefile.am.orig +sed -e 's/include src tests tools doc/include src tools doc/g' Makefile.am.orig > Makefile.am +chmod +w ./Makefile.in +mv Makefile.in Makefile.in.orig +sed -e 's/include src tests tools doc/include src tools doc/g' Makefile.in.orig > Makefile.in +fi + +if [ $is_mandriva2006 == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora4 == 1 ] || [ $is_fedora6 == 1 ] || [ $is_debian40 == 1 ] ; then + if test `uname -m` = "x86_64" ; then + if [ $is_mandriva2006 == 1 ] ; then + echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" + ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog + else + echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG" + ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog + fi + else + echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' >> ${PRODUCT_DIR}/CONFIGURE.LOG" + ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" >> ${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 +else + check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} +fi + +GCC=`which gcc` +cat >> ${PRODUCT_DIR}/MAKE.LOG < 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 +sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedimportcxx.la > libmedimportcxx.la.new +mv -f libmedimportcxx.la.new libmedimportcxx.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:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedimportcxx.la > libmedimportcxx.la.new +mv -f libmedimportcxx.la.new libmedimportcxx.la + +chmod 755 libmed.la +chmod 755 libmedC.la +chmod 755 libmedimport.la +chmod 755 libmedimportcxx.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-2.3.5" +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