From 87764e2c31529d2b59095d6cf02f5a09262b48a2 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 24 Feb 2010 11:11:48 +0000 Subject: [PATCH] Update for Salome 6.X --- config_files/{PyQt-4.5.4.sh => PyQt-4.7.0.sh} | 4 ++-- config_files/{Python-2.4.4.sh => Python-2.6.4.sh} | 4 ++-- config_files/{hdf5-1.6.9.sh => hdf5-1.8.4.sh} | 4 ++-- .../{qscintilla-2.4.sh => qscintilla-2.4.2.sh} | 11 ++++++++--- config_files/{qt-4.5.2.sh => qt-4.6.2.sh} | 12 ++++++------ config_files/{sip-4.8.2.sh => sip-4.10.0.sh} | 4 ++-- 6 files changed, 22 insertions(+), 17 deletions(-) rename config_files/{PyQt-4.5.4.sh => PyQt-4.7.0.sh} (99%) rename config_files/{Python-2.4.4.sh => Python-2.6.4.sh} (99%) rename config_files/{hdf5-1.6.9.sh => hdf5-1.8.4.sh} (98%) rename config_files/{qscintilla-2.4.sh => qscintilla-2.4.2.sh} (95%) rename config_files/{qt-4.5.2.sh => qt-4.6.2.sh} (96%) rename config_files/{sip-4.8.2.sh => sip-4.10.0.sh} (99%) diff --git a/config_files/PyQt-4.5.4.sh b/config_files/PyQt-4.7.0.sh similarity index 99% rename from config_files/PyQt-4.5.4.sh rename to config_files/PyQt-4.7.0.sh index e5a84b4..5ce37df 100755 --- a/config_files/PyQt-4.5.4.sh +++ b/config_files/PyQt-4.7.0.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : PyQt-4.5.4.sh +# File : PyQt-4.7.0.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -15,7 +15,7 @@ # # PyQt version # -PYQT_VERSION=4.5.4 +PYQT_VERSION=4.7.0 PYQT_XVERSION=`echo ${PYQT_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` check_version() diff --git a/config_files/Python-2.4.4.sh b/config_files/Python-2.6.4.sh similarity index 99% rename from config_files/Python-2.4.4.sh rename to config_files/Python-2.6.4.sh index 55294ea..84bf305 100755 --- a/config_files/Python-2.4.4.sh +++ b/config_files/Python-2.6.4.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : Python-2.5.4.sh +# File : Python-2.6.4.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 @@ # #################################################################################### -PY_VERSION=2.4.4 +PY_VERSION=2.6.4 PY_XVERSION=`echo ${PY_VERSION} | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'` PY_LIBVERSION=`echo ${PY_VERSION} | awk -F. '{printf("%d.%d",$1,$2)}'` diff --git a/config_files/hdf5-1.6.9.sh b/config_files/hdf5-1.8.4.sh similarity index 98% rename from config_files/hdf5-1.6.9.sh rename to config_files/hdf5-1.8.4.sh index 8ba4ce9..d2a8f39 100755 --- a/config_files/hdf5-1.6.9.sh +++ b/config_files/hdf5-1.8.4.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : hdf5-1.6.9.sh +# File : hdf5-1.8.4.sh # Created : Mon Oct 12 11:07:00 2009 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -15,7 +15,7 @@ # # HDF5 version # -HDF5_VERSION=1.6.9 +HDF5_VERSION=1.8.4 check_version() { diff --git a/config_files/qscintilla-2.4.sh b/config_files/qscintilla-2.4.2.sh similarity index 95% rename from config_files/qscintilla-2.4.sh rename to config_files/qscintilla-2.4.2.sh index aab750b..91e0d12 100755 --- a/config_files/qscintilla-2.4.sh +++ b/config_files/qscintilla-2.4.2.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : qscintilla-2.4.sh +# File : qscintilla-2.4.2.sh # Created : Thu Oct 23 11:50:00 2008 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -12,12 +12,17 @@ # #################################################################################### +# +#QSCINTILLA version +# +QSCINTILLA_VERSION=2.4.2 + check_version(){ if [ -z "${QSCINTILLA_DIR}" ]; then return 1 fi ver=`grep "QSCINTILLA_VERSION_STR" ${QSCINTILLA_DIR}/include/Qsci/qsciglobal.h | sed -e 's%^#define QSCINTILLA_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` -if [ "$ver" == "2.4" ] ; then +if [ "$ver" == "${QSCINTILLA_VERSION}" ] ; then return 0 fi return 1 @@ -132,7 +137,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="QScintilla-2.4" +export PRODUCT="QScintilla-${QSCINTILLA_VERSION}" 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/qt-4.5.2.sh b/config_files/qt-4.6.2.sh similarity index 96% rename from config_files/qt-4.5.2.sh rename to config_files/qt-4.6.2.sh index eeb6315..54f4258 100755 --- a/config_files/qt-4.5.2.sh +++ b/config_files/qt-4.6.2.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : qt-4.5.2.sh +# File : qt-4.6.2.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 @@ # #################################################################################### -QT_REF_VERSION="4.5.2" +QT_REF_VERSION="4.6.2" check_version(){ if [ -z "$QTDIR" ]; then @@ -63,10 +63,10 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT} -if [ -f patches/qt-4.5.2.patch ] ; then - cp patches/qt-4.5.2.patch ${PRODUCT_SRC_DIR} - ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < qt-4.5.2.patch ) -fi +#if [ -f patches/qt-4.5.2.patch ] ; then +# cp patches/qt-4.5.2.patch ${PRODUCT_SRC_DIR} +# ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < qt-4.5.2.patch ) +#fi # to generate environment scripts try_preinstalled diff --git a/config_files/sip-4.8.2.sh b/config_files/sip-4.10.0.sh similarity index 99% rename from config_files/sip-4.8.2.sh rename to config_files/sip-4.10.0.sh index 7e157a2..6e4bf21 100755 --- a/config_files/sip-4.8.2.sh +++ b/config_files/sip-4.10.0.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : sip-4.8.2.sh +# File : sip-4.10.0.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -15,7 +15,7 @@ # # sip version # -SIP_VERSION=4.8.2 +SIP_VERSION=4.10.0 SIP_XVERSION=`echo ${SIP_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` check_version() -- 2.39.2