From: inv Date: Mon, 2 Apr 2012 11:58:55 +0000 (+0000) Subject: SALOME 6.5.0 preparation: graphviz 2.26.3 -> 2.28.0 X-Git-Tag: V6_5_0b1~64 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a50ede5166d99dfb95e4fac91787ad8c5a2087fa;p=tools%2Finstall.git SALOME 6.5.0 preparation: graphviz 2.26.3 -> 2.28.0 --- diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index c6adf71..4128dc2 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -603,10 +603,10 @@ type="prerequisite" description="Graph Drawing Programs set"> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> + script="graphviz.sh"/> /dev/null` -if [ -n "$isdot" ]; then - ver=`dot -V 2>&1 | sed -e "s%[A-Za-z-]%%g" | awk '{print $1}'` - maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` - 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 22400 ] ; then - return 0 - fi -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh </dev/null | grep -E '^[0-9.]+$'%g" configure - -CONFIGURE_FLAGS="--disable-rpath" -if [ "${EXPAT_ROOT}" != "" ] ; then - CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-expat --with-expatincludedir=${EXPAT_ROOT}/include --with-expatlibdir=${EXPAT_ROOT}/lib --enable-perl=no " -fi -if test `uname -m` == "x86_64" ; then - CONFIGURE_FLAGS="${CONFIGURE_FLAGS} CFLAGS=-m64 CXXFLAGS=-m64" -fi - -check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} ${CONFIGURE_FLAGS} - -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG < $l"_" - chmod -f --reference=$l $l"_" - mv -f $l"_" $l - - lpath=`dirname $l` - libdir=`grep -e "^libdir=.*" $l | sed -e "s/^libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` - sed -e "s%${libdir}%${lpath}%g" $l > $l"_" - chmod -f --reference=$l $l"_" ; mv -f $l"_" $l - - expatdir=${EXPAT_ROOT}/lib - sed -e "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g" \ - -e "s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" $l > $l"_" - chmod -f --reference=$l $l"_" - mv -f $l"_" $l - - fi -done - -cd ${PRODUCT_DIR}/lib/pkgconfig -for l in X `find . -name "*.pc"`; do - if [ "${l}" != "X" ] ; then - sed -e "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} > ${l}_ - chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} - fi -done - -# to generate environment scripts -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; -test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="graphviz-2.26.3" -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/graphviz.sh b/config_files/graphviz.sh new file mode 100755 index 0000000..9b52d84 --- /dev/null +++ b/config_files/graphviz.sh @@ -0,0 +1,185 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : graphviz.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. +# +#################################################################################### + +# +# graphviz version +# +GRAPHVIZ_VERSION=2.28.0 + +check_version() +{ +isdot=`which dot 2>/dev/null` +if [ -n "$isdot" ]; then + ver=`dot -V 2>&1 | sed -e "s%[A-Za-z-]%%g" | awk '{print $1}'` + maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` + 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 22400 ] ; then + return 0 + fi +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh </dev/null | grep -E '^[0-9.]+$'%g" configure + +CONFIGURE_FLAGS="--disable-rpath" +if [ "${EXPAT_ROOT}" != "" ] ; then + CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-expat --with-expatincludedir=${EXPAT_ROOT}/include --with-expatlibdir=${EXPAT_ROOT}/lib --enable-perl=no " +fi +if test `uname -m` == "x86_64" ; then + CONFIGURE_FLAGS="${CONFIGURE_FLAGS} CFLAGS=-m64 CXXFLAGS=-m64" +fi + +check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} ${CONFIGURE_FLAGS} + +GCC=`which gcc` +cat >> ${PRODUCT_DIR}/MAKE.LOG < $l"_" + chmod -f --reference=$l $l"_" + mv -f $l"_" $l + + lpath=`dirname $l` + libdir=`grep -e "^libdir=.*" $l | sed -e "s/^libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` + sed -e "s%${libdir}%${lpath}%g" $l > $l"_" + chmod -f --reference=$l $l"_" ; mv -f $l"_" $l + + if [ "${EXPAT_ROOT}" != "" ] ; then + expatdir=${EXPAT_ROOT}/lib + sed -e "s%-L[^[:space:]]*expat[^[:space:]]*/lib%-L${expatdir}%g" \ + -e "s%[^[:space:]]*expat[^[:space:]]*/lib/libexpat.la%-lexpat%g" $l > $l"_" + chmod -f --reference=$l $l"_" + mv -f $l"_" $l + fi + fi +done + +cd ${PRODUCT_DIR}/lib/pkgconfig +for l in X `find . -name "*.pc"`; do + if [ "${l}" != "X" ] ; then + sed -e "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} > ${l}_ + chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} + fi +done + +# to generate environment scripts +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; +test $# == 10 && shift && SINGLE_DIR=$9 +export PRODUCT="graphviz-${GRAPHVIZ_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