From: inv Date: Tue, 3 Apr 2012 15:33:42 +0000 (+0000) Subject: SALOME 6.5.0 preparation: OCCT 6.5.2 -> 6.5.3 X-Git-Tag: V6_5_0b1~54 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=671d1a193f2e7ca1fea23b1da869c5ff3edd038a;hp=09d348c3e17a882f58675d83f30c2cb0dac19f91;p=tools%2Finstall.git SALOME 6.5.0 preparation: OCCT 6.5.2 -> 6.5.3 --- diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index d0f84f6..8f73384 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -493,12 +493,12 @@ + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> + description="Open CASCADE Technology"> + script="OCCT.sh"/> ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < /dev/null - if [ $? == 0 ] ; then is_mandriva2008=1 ; fi -fi - -if [ -e /etc/issue ] ; then - grep -e "Mandriva Linux release 2010.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2010=1 ; fi -fi - -if [ -e /etc/issue ] ; then - grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian40=1 ; fi -fi - -if [ -e /etc/issue ] ; then - grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian40=1 ; fi -fi - -if [ -e /etc/issue ] ; then - grep -e "Debian GNU/Linux 5.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian50=1 ; fi -fi - -if [ -e /etc/issue ] ; then - grep -e "Debian GNU/Linux 6.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian60=1 ; fi -fi - -if [ -e /etc/issue ] ; then -grep -e "CentOS release 5.5" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_centos=1 ; fi -fi - -if [ $is_centos == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_mandriva2010 == 1 ] || [ $is_debian40 == 1 ] || [ $is_debian50 == 1 ] || [ $is_debian60 == 1 ] ; then -where_xmu_include=/usr/include -else -where_xmu_include=/usr/X11R6/include -fi - -flags="" - -flags="$flags --with-xmu-include=$where_xmu_include" - -if test `uname -m` = "x86_64" ; then - flags="$flags --with-xmu-library=/usr/lib64" -else - flags="$flags --with-xmu-library=/usr/lib" -fi - -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 - -flags="$flags --with-tbb-include=${TBBHOME}/include" - -if test `uname -m` = "x86_64" ; then - flags="$flags --with-tbb-library=${TBBHOME}/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21" -else - flags="$flags --with-tbb-library=${TBBHOME}/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21" -fi - -flags="$flags --with-freetype=${FREETYPEDIR}" -flags="$flags --with-ftgl=${FTGLDIR}" -flags="$flags --with-freeimage=${FREEIMAGEDIR}" -flags="$flags --with-gl2ps=${GL2PSHOME}" - -flags="$flags --disable-debug --enable-production" - -export CASROOT=${PRODUCT_SRC_DIR} - -check_job ${PRODUCT_DIR}/BUILDCONFIGURE.LOG ./build_configure - -check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} $flags - -# make -echo " +++++++++++ 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\b%%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_SRC_DIR} > ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; - -# remove sources and temporary files after building -echo "${INSTALL_PRODUCTS}" | grep -q "PatchForOpenCascade" -if [ $? -eq 1 ] && [ ${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} - -is_mandriva2008=0 - -if [ -e /etc/issue ] ; then - grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2008=1 ; fi -fi - -# 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` -freetypedir=`printenv FREETYPEDIR` -ftgldir=`printenv FTGLDIR` -gl2psdir=`printenv GL2PSHOME` -freeimagedir=`printenv FREEIMAGEDIR` -tbbbasedir=`printenv TBBHOME` - -TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21' -if test `uname -m` = "x86_64" ; then - export TBBMODE="intel64/$TBBKERNEL" -else - export TBBMODE="ia32/$TBBKERNEL" -fi - -tbbdir=${tbbbasedir}/lib/$TBBMODE - -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 - if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then - sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \ - -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' $l > _$l - mv -f _$l $l - fi - chmod a+x $l - if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then - sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \ - -e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' $l > _$l - mv -f _$l $l - fi - chmod a+x $l - if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then - sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" $l > _$l - mv -f _$l $l - fi - chmod a+x $l - if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then - sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l - mv -f _$l $l - fi - chmod a+x $l - if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then - sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9][0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l - mv -f _$l $l - fi - chmod a+x $l - if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then - sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%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\b%%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 - -# 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; -test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="OCCT-6.5.2" -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/OCCT.sh b/config_files/OCCT.sh new file mode 100755 index 0000000..cb6536e --- /dev/null +++ b/config_files/OCCT.sh @@ -0,0 +1,320 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : OCCT.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. +# +#################################################################################### + +# +# Open CASCADE Technology version +# +OCCT_VERSION=6.5.3 + +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" == "${OCCT_VERSION}" ] ; then + return 0 +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${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\b%%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_SRC_DIR} > ${PRODUCT_DIR}/size.log +cd ${PRODUCT_DIR}; + +# remove sources and temporary files after building +echo "${INSTALL_PRODUCTS}" | grep -q "PatchForOpenCascade" +if [ $? -eq 1 ] && [ ${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 +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 + +tcldir=`printenv TCLHOME` +freetypedir=`printenv FREETYPEDIR` +ftgldir=`printenv FTGLDIR` +gl2psdir=`printenv GL2PSHOME` +freeimagedir=`printenv FREEIMAGEDIR` +tbbbasedir=`printenv TBBHOME` + +TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21' +if test `uname -m` = "x86_64" ; then + export TBBMODE="intel64/$TBBKERNEL" +else + export TBBMODE="ia32/$TBBKERNEL" +fi + +tbbdir=${tbbbasedir}/lib/$TBBMODE + +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 + if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then + sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \ + -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' $l > _$l + mv -f _$l $l + fi + chmod a+x $l + if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then + sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \ + -e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' $l > _$l + mv -f _$l $l + fi + chmod a+x $l + if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then + sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" $l > _$l + mv -f _$l $l + fi + chmod a+x $l + if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then + sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l + mv -f _$l $l + fi + chmod a+x $l + if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then + sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9][0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l + mv -f _$l $l + fi + chmod a+x $l + if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then + sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%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\b%%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 + +# 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; +test $# == 10 && shift && SINGLE_DIR=$9 +export PRODUCT="OCCT-${OCCT_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