From 1570e1449abc05705e170f535072be195e40092a Mon Sep 17 00:00:00 2001 From: inv Date: Mon, 31 Oct 2011 07:18:11 +0000 Subject: [PATCH] Update for Salome 6.4.0 --- config_files/CAS-6.3sp13-patch.sh | 134 ------------------ .../{CAS-6.3sp13.sh => OCCT-6.5.2.sh} | 36 +++-- .../{tcltk-8.4.14.sh => tcltk-8.5.8.sh} | 28 ++-- 3 files changed, 40 insertions(+), 158 deletions(-) delete mode 100755 config_files/CAS-6.3sp13-patch.sh rename config_files/{CAS-6.3sp13.sh => OCCT-6.5.2.sh} (91%) rename config_files/{tcltk-8.4.14.sh => tcltk-8.5.8.sh} (92%) diff --git a/config_files/CAS-6.3sp13-patch.sh b/config_files/CAS-6.3sp13-patch.sh deleted file mode 100755 index d12ad1c..0000000 --- a/config_files/CAS-6.3sp13-patch.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : CAS-6.3sp13.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. -# -#################################################################################### - -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.3" ] ; 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-PATH.LOG < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; - -# remove sources and temporary files after building -if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then - test -d ${INST_ROOT}/${PRODUCT}-patch_SRC && rm -fr ${INST_ROOT}/${PRODUCT}-patch_SRC - 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 - -check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-patch.tar.gz -C ${PRODUCT_DIR} - -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="CAS-6.3sp13" -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/CAS-6.3sp13.sh b/config_files/OCCT-6.5.2.sh similarity index 91% rename from config_files/CAS-6.3sp13.sh rename to config_files/OCCT-6.5.2.sh index 1af507f..eeab9c0 100755 --- a/config_files/CAS-6.3sp13.sh +++ b/config_files/OCCT-6.5.2.sh @@ -1,7 +1,7 @@ -#!/bin/bash -noprofile +!/bin/bash -noprofile #################################################################################### -# File : CAS-6.3sp13.sh +# File : OCCT-6.5.2.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -25,7 +25,7 @@ ver_major=`grep "#define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx 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.3" ] ; then +if [ "$ver" == "6.5.2" ] ; then return 0 fi return 1 @@ -103,13 +103,18 @@ is_mandriva2008=0 is_debian40=0 if [ -e /etc/issue ] ; then - grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null + grep -e "Mandriva Linux release 2008.0" /etc/issue > /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_mandriva2007=1 ; fi fi if [ -e /etc/issue ] ; then - grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2008=1 ; fi + grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_debian40=1 ; fi fi if [ -e /etc/issue ] ; then @@ -117,10 +122,21 @@ if [ -e /etc/issue ] ; then if [ $? == 0 ] ; then is_debian40=1 ; fi fi -if [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_debian40 == 1 ] ; then -where_xmu_include=/usr/include/X11 +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 [ $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/X11 +where_xmu_include=/usr/X11R6/include fi flags="$flags --with-xmu-include=$where_xmu_include" @@ -275,7 +291,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="CAS-6.3sp13" +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 diff --git a/config_files/tcltk-8.4.14.sh b/config_files/tcltk-8.5.8.sh similarity index 92% rename from config_files/tcltk-8.4.14.sh rename to config_files/tcltk-8.5.8.sh index 3b39e0e..9f863b3 100755 --- a/config_files/tcltk-8.4.14.sh +++ b/config_files/tcltk-8.5.8.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : tcltk-8.4.14.sh +# File : tcltk-8.5.8.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -12,7 +12,7 @@ # #################################################################################### -VERSION="8.4" +VERSION="8.5" check_version() { @@ -90,9 +90,9 @@ source ${INSTALL_WORK}/$SHRC mkdir -p ${PRODUCT_SRC_DIR} -check_jb tar xfz ${SOURCE_DIR}/tcl8.4.14.tar.gz -C ${PRODUCT_SRC_DIR} -check_jb tar xfz ${SOURCE_DIR}/tk8.4.14.tar.gz -C ${PRODUCT_SRC_DIR} -check_jb tar xfz ${SOURCE_DIR}/tclx8.3.5.tar.gz -C ${PRODUCT_SRC_DIR} +check_jb tar xfz ${SOURCE_DIR}/tcl8.5.8.tar.gz -C ${PRODUCT_SRC_DIR} +check_jb tar xfz ${SOURCE_DIR}/tk8.5.8.tar.gz -C ${PRODUCT_SRC_DIR} +check_jb tar xfz ${SOURCE_DIR}/tclx8.4.0.tar.gz -C ${PRODUCT_SRC_DIR} # to generate environment scripts try_preinstalled @@ -106,7 +106,7 @@ install_source # build sources test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -cd ${PRODUCT_SRC_DIR}/tcl8.4.14_SRC/unix +cd ${PRODUCT_SRC_DIR}/tcl8.5.8_SRC/unix cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <