From: maintenance team Date: Wed, 3 Oct 2007 14:20:57 +0000 (+0000) Subject: Changing CASCADE version from 6.2sp2 to 6.2sp3 X-Git-Tag: V_3_2_9~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8f14904f0b2d50017d1b3a55f18dcf3236917ca6;p=tools%2Finstall.git Changing CASCADE version from 6.2sp2 to 6.2sp3 --- diff --git a/config.xml b/config.xml index e7405a4..5f0669a 100644 --- a/config.xml +++ b/config.xml @@ -105,15 +105,15 @@ temporarydiskspace="25500" script="SWIG-1.3.24.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> + script="CAS-6.2sp3.sh"/> ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < /dev/null - if [ $? == 0 ] ; then is_mandriva2007=1 ; fi -fi - -if [ $is_mandriva2007 == 1 ] ; then -where_xmu_include=/usr/include/X11 -else -where_xmu_include=/usr/X11R6/include/X11 -fi - -if test `uname -m` = "x86_64" ; then - flags="$flags --with-xmu-include=$where_xmu_include" - flags="$flags --with-xmu-library=/usr/X11R6/lib64" -else - flags="$flags --with-xmu-include=$where_xmu_include" - flags="$flags --with-xmu-library=/usr/X11R6/lib" -fi - flags="$flags LDFLAGS=-lpthread" -glincdir="`where_gl_includes`" -if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi -gllibdir="`where_gl_libs`" -if [ $? -eq 0 ] ; then flags="$flags --with-gl-library=$gllibdir"; fi -tcldir="`where_tcl`" -if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi -tkdir="`where_tk`" -if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi -dpsdir="`where_dps`" -if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi -flags="$flags --disable-jcas --disable-debug --enable-production" - -export CASROOT=${PRODUCT_WORK} - -if test `uname -m` = "x86_64" ; then -echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG" -./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog -else -echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG" -./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog -fi - -if [ "$?" -ne "0" ] ; then - cat ${PRODUCT_DIR}/CONFIGURE.LOG - cat ${INSTALL_WORK}/errlog >&2 - cat ${INSTALL_WORK}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG - exit 1 -fi - -# make -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG </dev/null`" ] ; then - str_to_replace="${gllibdir}/libGL.la" - fi - fi - if [ "$str_to_replace" == "" ] ; then - str_to_replace="-L${gllibdir} -lGL" - fi - sed -e "s%-lGL%%g" \ - -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ - libTKOpenGl.la > libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la -fi - -#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} -print_env -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/CAS-6.2sp2.tar.gz -C ${INSTALL_ROOT} - -# modify *.la files -ldir=${PRODUCT_DIR}/lib -if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi -if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi -cd $ldir -# 1. set libdir correctly, correct dependencies, set tcldir correctly -tcldir=`printenv TCLHOME` -for l in X `find . -name "*.la"`; do - if [ "$l" != "X" ] ; then - l=`basename $l` - libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` - sed -e "s%${libdir}%${ldir}%g" $l > _$l - mv -f _$l $l - if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then - sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l - mv -f _$l $l - fi - chmod a+x $l - fi -done - -# 2. fix libGL dependencies -cd $ldir -gllibdir="`where_gl_libs`" -if [ "$gllibdir" != "" ] ; then - if [ -f ${gllibdir}/libGL.la ] ; then - libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"` - if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then - str_to_replace="${gllibdir}/libGL.la" - fi - fi - if [ "$str_to_replace" == "" ] ; then - str_to_replace="-L${gllibdir} -lGL" - fi - sed -e "s%-lGL%%g" \ - -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ - libTKOpenGl.la > libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la -fi - -print_env -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="cas" ; fi -export PRODUCT="CAS-6.2sp2" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/CAS-6.2sp3.sh b/config_files/CAS-6.2sp3.sh new file mode 100755 index 0000000..7b61816 --- /dev/null +++ b/config_files/CAS-6.2sp3.sh @@ -0,0 +1,257 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : CAS-6.2sp3.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() +{ +if [ -z "$CASROOT" ]; then + return 1 +fi +check_lib_version ${CASROOT}/inc/Standard_Version.hxx +if [ "$?" -ne "0" ] ; then + return 1 +fi +ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` +ver_minor=`grep "#define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` +ver_maint=`grep "#define OCC_VERSION_MAINTENANCE" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'` +ver="$ver_major.$ver_minor.$ver_maint" +if [ "$ver" == "6.2sp3" ] ; then + return 0 +fi +return 1 +} + +print_env() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < /dev/null + if [ $? == 0 ] ; then is_mandriva2007=1 ; fi +fi + +if [ $is_mandriva2007 == 1 ] ; then +where_xmu_include=/usr/include/X11 +else +where_xmu_include=/usr/X11R6/include/X11 +fi + +if test `uname -m` = "x86_64" ; then + flags="$flags --with-xmu-include=$where_xmu_include" + flags="$flags --with-xmu-library=/usr/X11R6/lib64" +else + flags="$flags --with-xmu-include=$where_xmu_include" + flags="$flags --with-xmu-library=/usr/X11R6/lib" +fi + flags="$flags LDFLAGS=-lpthread" +glincdir="`where_gl_includes`" +if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi +gllibdir="`where_gl_libs`" +if [ $? -eq 0 ] ; then flags="$flags --with-gl-library=$gllibdir"; fi +tcldir="`where_tcl`" +if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi +tkdir="`where_tk`" +if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi +dpsdir="`where_dps`" +if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi +flags="$flags --disable-jcas --disable-debug --enable-production" + +export CASROOT=${PRODUCT_WORK} + +if test `uname -m` = "x86_64" ; then +echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG" +./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog +else +echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG" +./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog +fi + +if [ "$?" -ne "0" ] ; then + cat ${PRODUCT_DIR}/CONFIGURE.LOG + cat ${INSTALL_WORK}/errlog >&2 + cat ${INSTALL_WORK}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG + exit 1 +fi + +# make +GCC=`which gcc` +cat >> ${PRODUCT_DIR}/MAKE.LOG </dev/null`" ] ; then + str_to_replace="${gllibdir}/libGL.la" + fi + fi + if [ "$str_to_replace" == "" ] ; then + str_to_replace="-L${gllibdir} -lGL" + fi + sed -e "s%-lGL%%g" \ + -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ + libTKOpenGl.la > libTKOpenGl.la.new + mv -f libTKOpenGl.la.new libTKOpenGl.la +fi + +#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} +print_env +} + +install_binary() +{ +make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} +source ${INSTALL_WORK}/$SHRC + +check_jb tar xfz ${SOURCE_DIR}/CAS-6.2sp3.tar.gz -C ${INSTALL_ROOT} + +# modify *.la files +ldir=${PRODUCT_DIR}/lib +if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi +if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi +cd $ldir +# 1. set libdir correctly, correct dependencies, set tcldir correctly +tcldir=`printenv TCLHOME` +for l in X `find . -name "*.la"`; do + if [ "$l" != "X" ] ; then + l=`basename $l` + libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"` + sed -e "s%${libdir}%${ldir}%g" $l > _$l + mv -f _$l $l + if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then + sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l + mv -f _$l $l + fi + chmod a+x $l + fi +done + +# 2. fix libGL dependencies +cd $ldir +gllibdir="`where_gl_libs`" +if [ "$gllibdir" != "" ] ; then + if [ -f ${gllibdir}/libGL.la ] ; then + libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"` + if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then + str_to_replace="${gllibdir}/libGL.la" + fi + fi + if [ "$str_to_replace" == "" ] ; then + str_to_replace="-L${gllibdir} -lGL" + fi + sed -e "s%-lGL%%g" \ + -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ + libTKOpenGl.la > libTKOpenGl.la.new + mv -f libTKOpenGl.la.new libTKOpenGl.la +fi + +print_env +} + +export PROCEDURE=$1; +export INSTALL_WORK=$2; +export SOURCE_DIR=$3; +export INSTALL_ROOT=$4; +export PRODUCT_SEQUENCE=$5; +if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="cas" ; fi +export PRODUCT="CAS-6.2sp3" +export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} +export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} +source ./common.sh +$PROCEDURE