From db40bf3de6399686cdfd77308851b4bc87dc6fb5 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 31 Oct 2007 12:55:34 +0000 Subject: [PATCH] Update for Salome 4X --- config_files/graphviz-1.9.sh | 129 ------------------ .../{graphviz-2.2.1.sh => graphviz-2.2.3.sh} | 21 ++- config_files/{med-2.3.1.sh => med-2.3.2.sh} | 14 +- 3 files changed, 21 insertions(+), 143 deletions(-) delete mode 100755 config_files/graphviz-1.9.sh rename config_files/{graphviz-2.2.1.sh => graphviz-2.2.3.sh} (85%) rename config_files/{med-2.3.1.sh => med-2.3.2.sh} (92%) diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh deleted file mode 100755 index a3749a8..0000000 --- a/config_files/graphviz-1.9.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : graphviz-1.9.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-2007 CEA -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -check_version() -{ -isdot=`which dot 2>/dev/null` -if [ -n "$isdot" ]; then - ver=`dot -V 2>&1 | awk '{print $3}'` - if [ "$ver" == "1.9" ]; then - return 0 - fi -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; - -# remove sources and temporary files after building -if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then - test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -cd ${PRODUCT_DIR}/lib/graphviz -for l in `ls *.la`; do - libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` - sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" $l > _$l - libdir=`dirname $libdir` - sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l - rm -f _$l - chmod a+x $l -done - -# to generate environment scripts -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -shift -REMOVE_SRC_TMP=$8; -export PRODUCT="graphviz-1.9" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.3.sh similarity index 85% rename from config_files/graphviz-2.2.1.sh rename to config_files/graphviz-2.2.3.sh index b6c4f99..9d71938 100755 --- a/config_files/graphviz-2.2.1.sh +++ b/config_files/graphviz-2.2.3.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : graphviz-2.2.1.sh +# File : graphviz-2.2.3.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -21,7 +21,7 @@ if [ -n "$isdot" ]; then min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` let ver=$maj_ver*10000+$min_ver*100+$rel_ver - if [ $ver -eq 20201 ] ; then + if [ $ver -eq 20203 ] ; then return 0 fi fi @@ -32,8 +32,9 @@ print_env_bin() { cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < _$l libdir=`dirname $libdir` sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l - rm -f _$l + tmp="" + if [ -n "${TCLHOME}" ]; then + tmp="-L${TCLHOME}/lib" + fi + sed -e "s%-L[^[:space:]]*/tcltk-[0-9]\+\.[0-9]\+\.[0-9]\+/lib[[:space:]]%$tmp %g" $l > _$l + mv -f _$l $l chmod a+x $l done @@ -130,7 +137,7 @@ export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; -export PRODUCT="graphviz-2.2.1" +export PRODUCT="graphviz-2.2.3" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/med-2.3.1.sh b/config_files/med-2.3.2.sh similarity index 92% rename from config_files/med-2.3.1.sh rename to config_files/med-2.3.2.sh index 74e1872..bfd9a6c 100755 --- a/config_files/med-2.3.1.sh +++ b/config_files/med-2.3.2.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : med-2.3.1.sh +# File : med-2.3.2.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -18,7 +18,7 @@ if [ -z "$MED2HOME" ]; then #echo "MED2HOME doesn't set" return 1 fi -check_lib_version libmed.so.1.0.2 ${MED2HOME}/lib +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 @@ -143,17 +143,17 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} ### 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 +sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%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 +sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' libmedC.la > libmedC.la.new mv -f libmedC.la.new libmedC.la tmp="" if [ -n "${HDF5HOME}" ]; then tmp="-L${HDF5HOME}/lib" fi -sed -e "s%\(-L[^[:space:]]*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)%$tmp %g" libmed.la > libmed.la.new +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%\(-L[^[:space:]]*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)%$tmp %g" libmedC.la > libmedC.la.new +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 chmod 755 libmed.la @@ -178,7 +178,7 @@ export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; -export PRODUCT="med-2.3.1" +export PRODUCT="med-2.3.2" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh -- 2.39.2