From 671d1a193f2e7ca1fea23b1da869c5ff3edd038a Mon Sep 17 00:00:00 2001 From: inv Date: Tue, 3 Apr 2012 15:33:42 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: OCCT 6.5.2 -> 6.5.3 --- config_CentOS_5.5_64bit.xml | 6 +- config_Debian_4.0.xml | 6 +- config_Debian_4.0_64bit.xml | 6 +- config_Debian_5.0_64bit.xml | 6 +- config_Debian_6.0_64bit.xml | 6 +- config_Mandriva_2008.0.xml | 6 +- config_Mandriva_2008.0_64bit.xml | 6 +- config_Mandriva_2010.0.xml | 6 +- config_Mandriva_2010.0_64bit.xml | 6 +- config_Red_Hat_Enterprise_WS_4_64bit.xml | 6 +- config_Scientific_SL_5.1_64bit.xml | 6 +- config_files/{OCCT-6.5.2.sh => OCCT.sh} | 140 ++++++++--------------- 12 files changed, 83 insertions(+), 123 deletions(-) rename config_files/{OCCT-6.5.2.sh => OCCT.sh} (77%) 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"/> /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 +# build_configure -if [ -e /etc/issue ] ; then - grep -e "Debian GNU/Linux 5.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian50=1 ; fi -fi +echo " +++++++++++ build_configure" -if [ -e /etc/issue ] ; then - grep -e "Debian GNU/Linux 6.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_debian60=1 ; fi -fi +check_job ${PRODUCT_DIR}/BUILDCONFIGURE.LOG ./build_configure -if [ -e /etc/issue ] ; then -grep -e "CentOS release 5.5" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_centos=1 ; fi -fi +# configure -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 +echo " +++++++++++ configure" 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 +# ... tcl/tk options 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" +# ... tbb options +if [ "${TBBHOME}" != "" ] ; then + 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 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 +# ... freetype options +if [ "{FREETYPEDIR}" != "" ] ; then + flags="$flags --with-freetype=${FREETYPEDIR}" +fi +# ... ftgl options +if [ "{FTGLDIR}" != "" ] ; then + flags="$flags --with-ftgl=${FTGLDIR}" +fi +# ... freeimage options +if [ "{FREEIMAGEDIR}" != "" ] ; then + flags="$flags --with-freeimage=${FREEIMAGEDIR}" +fi +# ... gl2ps options +if [ "{GL2PSHOME}" != "" ] ; then + flags="$flags --with-gl2ps=${GL2PSHOME}" +fi +# other options +flags="$flags --disable-production --enable-debug" check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} $flags # make + echo " +++++++++++ make" + GCC=`which gcc` cat >> ${PRODUCT_DIR}/MAKE.LOG < /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 + +# 1. set libdir correctly, correct dependencies + tcldir=`printenv TCLHOME` freetypedir=`printenv FREETYPEDIR` ftgldir=`printenv FTGLDIR` @@ -352,7 +312,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="OCCT-6.5.2" +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 -- 2.30.2