From 6f6821c9deafb892142ddee84abf61c6cd5c01d0 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 31 Oct 2007 12:02:03 +0000 Subject: [PATCH] *** empty log message *** --- config_files/sip-4.1.sh | 150 -------------------- config_files/{sip-4.2.1.sh => sip-4.5.2.sh} | 14 +- 2 files changed, 3 insertions(+), 161 deletions(-) delete mode 100755 config_files/sip-4.1.sh rename config_files/{sip-4.2.1.sh => sip-4.5.2.sh} (94%) diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh deleted file mode 100755 index 4187208..0000000 --- a/config_files/sip-4.1.sh +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : sip-4.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-2007 CEA -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -check_version() -{ -if [ -n "${SIPDIR}" ]; then - ver=`${SIPDIR}/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 40100 ] ; 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 < ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; - -# remove sources and temporary files after building -if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then - test -d ${PRODUCT_DIR}_SRC && rm -fr ${PRODUCT_DIR}_SRC -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} - -# modify sipconfig.py file -if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then - cd ${PRODUCT_DIR} - python_version=`python -V 2>&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/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'` - sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/bin',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/include/python${PYTHON_VERSION}',%g" sipconfig.py.1 > sipconfig.py - sed -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/lib/python${PYTHON_VERSION}/config',%g" sipconfig.py > sipconfig.py.1 - sed -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g" sipconfig.py.1 > sipconfig.py - rm sipconfig.py.1 -fi - -# to generate environment scripts -try_preinstalled -} - -export PROCEDURE=$1; -export INSTALL_WORK=$2; -export SOURCE_DIR=$3; -export INSTALL_ROOT=$4; -export PRODUCT_SEQUENCE=$5; -export PRODUCT_TYPE=$6; -export INSTALL_PRODUCTS=$7; -shift -REMOVE_SRC_TMP=$8; -export PRODUCT="sip-4.1" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/sip-4.2.1.sh b/config_files/sip-4.5.2.sh similarity index 94% rename from config_files/sip-4.2.1.sh rename to config_files/sip-4.5.2.sh index 7afe6a9..210a59d 100755 --- a/config_files/sip-4.2.1.sh +++ b/config_files/sip-4.5.2.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : sip-4.2.1.sh +# File : sip-4.5.2.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -20,7 +20,7 @@ if [ -n "${SIPDIR}" ]; then 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 40201 ] ; then + if [ $ver -eq 40502 ] ; then return 0 fi fi @@ -65,14 +65,6 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INSTALL_ROOT} -# apply patch for 64-bit platforms -if test `uname -m` = "x86_64" ; then - if [ -f patches/sip-4.2.1-lib64.patch ] ; then - cp patches/sip-4.2.1-lib64.patch ${PRODUCT_DIR}_SRC - ( cd ${PRODUCT_DIR}_SRC ; patch -p1 < sip-4.2.1-lib64.patch ) - fi -fi - # to generate environment scripts try_preinstalled } @@ -157,7 +149,7 @@ export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; -export PRODUCT="sip-4.2.1" +export PRODUCT="sip-4.5.2" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh -- 2.39.2