From: vsr Date: Tue, 3 Apr 2012 19:22:42 +0000 (+0000) Subject: SALOME 6.5.0 preparation: update script for sip (4.10.2) X-Git-Tag: V6_5_0b1~48 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e613086f17ef90a856e5745365bf4e615071a6d4;p=tools%2Finstall.git SALOME 6.5.0 preparation: update script for sip (4.10.2) --- diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 8f16f47..abd0923 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -399,7 +399,7 @@ version="4.10.2" disable="false" installdiskspace="308,1450,2476" - script="sip-4.10.2.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> + script="sip.sh"/> 0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` - min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` - rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` - let ver=$maj_ver*10000+$min_ver*100+$rel_ver - if [ $ver -eq ${SIP_XVERSION} ] ; then - return 0 - fi -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG <&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'` - qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'` - sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/bin',%g" \ - -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/site-packages',%g" \ - -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \ - -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g" \ - -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g" \ - -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages',%g" \ - -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \ - -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" \ - -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \ - -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \ - -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \ - -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \ - -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" \ - -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g" \ - -e "s%\('sip_config_args':[[:space:]]*\).*%\1'${SIP_CONFIGURE_OPTIONS}',%g" \ - -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" \ - -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/config',%g" \ - -e "s%\('py_conf_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1 - mv -f sipconfig.py.1 sipconfig.py -fi - -# to generate environment scripts -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="sip-${SIP_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 diff --git a/config_files/sip.sh b/config_files/sip.sh new file mode 100755 index 0000000..1b8ba04 --- /dev/null +++ b/config_files/sip.sh @@ -0,0 +1,177 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : sip.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. +# +#################################################################################### + +# +# sip version +# +SIP_VERSION=4.10.2 +SIP_XVERSION=`echo ${SIP_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` + +check_version() +{ +if [ -n "${SIPDIR}" ]; then + ver=`${SIPDIR}/bin/sip -V | awk '{print $1}'` + maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` + min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` + rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'` + let ver=$maj_ver*10000+$min_ver*100+$rel_ver + if [ $ver -eq ${SIP_XVERSION} ] ; then + return 0 + fi +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG <&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'` + qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'` + sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/bin',%g" \ + -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/site-packages',%g" \ + -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \ + -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g" \ + -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g" \ + -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages',%g" \ + -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \ + -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" \ + -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \ + -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \ + -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \ + -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \ + -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" \ + -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g" \ + -e "s%\('sip_config_args':[[:space:]]*\).*%\1'${SIP_CONFIGURE_OPTIONS}',%g" \ + -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" \ + -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/config',%g" \ + -e "s%\('py_conf_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1 + mv -f sipconfig.py.1 sipconfig.py +fi + +# to generate environment scripts +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="sip-${SIP_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