From 1469c8b2cb6141448201bd744569a102ed80dd74 Mon Sep 17 00:00:00 2001 From: inv Date: Wed, 9 Nov 2011 07:19:05 +0000 Subject: [PATCH] Update for salome 6.4.0 --- config_Mandriva_2008.0.xml | 101 ++++++++++--- config_files/DISTENE.sh | 2 +- config_files/OCCT-6.5.2.sh | 10 +- config_files/freeimage-3.14.1.sh | 153 ++++++++++++++++++++ config_files/freetype-2.3.7.sh | 138 ++++++++++++++++++ config_files/ftgl-2.1.2.sh | 138 ++++++++++++++++++ config_files/gl2ps-1.3.5.sh | 144 ++++++++++++++++++ config_files/{med-3.0.3.sh => med-3.0.4.sh} | 4 +- config_files/tbb30_018oss.sh | 101 +++++++++++++ config_files/tcltk-8.5.8.sh | 43 +++--- 10 files changed, 786 insertions(+), 48 deletions(-) create mode 100755 config_files/freeimage-3.14.1.sh create mode 100755 config_files/freetype-2.3.7.sh create mode 100755 config_files/ftgl-2.1.2.sh create mode 100755 config_files/gl2ps-1.3.5.sh rename config_files/{med-3.0.3.sh => med-3.0.4.sh} (99%) create mode 100755 config_files/tbb30_018oss.sh diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index d247e66..fa542fc 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -369,10 +369,10 @@ type="prerequisite" description="Tcl/Tk library"> + script="tcltk-8.5.8.sh"/> - + + + + + + + description="Library for supporting different graphical formats PNG, BMP, JPEG, TIFF and others"> + + + + script="cmake-2.8.4.sh"/> - + description="Library for printing an OpenGL output to PostScript (and PDF, and SVG...)."> + version="1.3.5" + disable="false" + installdiskspace="86460,273932,478152" + script="gl2ps-1.3.5.sh"/> + + + + + + + + + @@ -509,15 +563,6 @@ installdiskspace="4296,5644,14388" script="scotch-5.1.11.sh"/> - - - @@ -1061,7 +1106,18 @@ Python tcltk + + freetype + + + cmake + + tbb + gl2ps + freeimage + ftgl + freetype tcltk @@ -1076,6 +1132,9 @@ Hdf + + Hdf + Python tcltk diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh index c019507..12a5af4 100755 --- a/config_files/DISTENE.sh +++ b/config_files/DISTENE.sh @@ -106,4 +106,4 @@ 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 +$PROCEDURE diff --git a/config_files/OCCT-6.5.2.sh b/config_files/OCCT-6.5.2.sh index c6310a8..3c352d8 100755 --- a/config_files/OCCT-6.5.2.sh +++ b/config_files/OCCT-6.5.2.sh @@ -141,6 +141,8 @@ else where_xmu_include=/usr/X11R6/include fi +flags="" + flags="$flags --with-xmu-include=$where_xmu_include" if test `uname -m` = "x86_64" ; then @@ -161,9 +163,9 @@ 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}/intel64/cc4.1.0_libc2.4_kernel2.6.16.21" + flags="$flags --with-tbb-library=${TBBHOME}/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21" else - flags="$flags --with-tbb-library=${TBBHOME}/ia32/cc4.1.0_libc2.4_kernel2.6.16.21" + flags="$flags --with-tbb-library=${TBBHOME}/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21" fi flags="$flags --with-freetype=${FREETYPEDIR}" @@ -175,8 +177,10 @@ flags="$flags --disable-debug --enable-production" export CASROOT=${PRODUCT_SRC_DIR} +./build_configure + echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG" -./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog +check_job ./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog # make echo " +++++++++++ make" diff --git a/config_files/freeimage-3.14.1.sh b/config_files/freeimage-3.14.1.sh new file mode 100755 index 0000000..b2ee2e7 --- /dev/null +++ b/config_files/freeimage-3.14.1.sh @@ -0,0 +1,153 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : freeimage-3.14.1.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-2008 CEA +# +# This script is the part of the SALOME installation procedure. +# +#################################################################################### + +FREEIMAGE_REF_VERSION="3.14.1" + +check_version() +{ +# check existance of freeimage and its version +if [ -n ${FREEIMAGEDIR} ]; then + return 0 +fi +ver_major=`cat ${PRODUCT_SRC_DIR}/FreeImage.rc | grep PRODUCTVERSION | sed -e "s%[A-Z0 ]%%g" | sed -e "s%[,]% %g" | awk '{ print $1}'` +ver_minor=`cat ${PRODUCT_SRC_DIR}/FreeImage.rc | grep PRODUCTVERSION | sed -e "s%[A-Z0 ]%%g" | sed -e "s%[,]% %g" | awk '{ print $2}'` +ver_maint=`cat ${PRODUCT_SRC_DIR}/FreeImage.rc | grep PRODUCTVERSION | sed -e "s%[A-Z0 ]%%g" | sed -e "s%[,]% %g" | awk '{ print $3}'` +ver="$ver_major.$ver_minor.$ver_maint" +if [ "$ver" == "${FREEIMAGE_REF_VERSION}" ] ; then + return 0 +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < Common.mk.in -cd ${PRODUCT_SRC_DIR}/tclx8.3.5_SRC/tcl/unix -mv tclxConfig.sh.in tclxConfig.sh.in.orig -sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tclxConfig.sh.in.orig > tclxConfig.sh.in -cd ${PRODUCT_SRC_DIR}/tclx8.3.5_SRC/tk/unix -mv tkxConfig.sh.in tkxConfig.sh.in.orig -sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tkxConfig.sh.in.orig > tkxConfig.sh.in - -cd ${PRODUCT_SRC_DIR}/tclx8.3.5_SRC/unix +#vsr: patch tclx 8.4.0 to make it compiliable on Mandriva 2006.0 +#mv Common.mk.in Common.mk.in.orig +#sed -e 's/@DEFS@/-DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void/g' Common.mk.in.orig > Common.mk.in +#cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC/tcl/unix +#mv tclxConfig.sh.in tclxConfig.sh.in.orig +#sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tclxConfig.sh.in.orig > tclxConfig.sh.in +#cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC/tk/unix +#mv tkxConfig.sh.in tkxConfig.sh.in.orig +#sed -e 's/@DEFS@/ -DSTDC_HEADERS=1 -DNDEBUG=1 -DRETSIGTYPE=void /g' tkxConfig.sh.in.orig > tkxConfig.sh.in + +#cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC/unix #VRV - bug in a tclx configure -chmod +w ./configure -echo -e '/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1\ns/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 0\nwq' | ed - configure +#chmod +w ./configure +#echo -e '/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1\ns/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 0\nwq' | ed - configure #INV - bug in a tclx configure -cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure -chmod 755 ./configure +#cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure +#chmod 755 ./configure #VRV - bug in a tclx configure +cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC + cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKEINSTALLEXEC.LOG <