From 4e158d879a8c940d49779364f84c1526d39d14dd Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 19 May 2006 10:13:17 +0000 Subject: [PATCH] Provide sip 4.2.1 support (native, sources, binaries) for Mandriva 2006.0 --- config_Mandriva_2006.0.xml | 14 ++-- config_files/sip-4.1.sh | 45 +++++++----- config_files/sip-4.2.1.sh | 135 +++++++++++++++++++++++++++++++++++ src/SALOME_InstallWizard.cxx | 2 +- 4 files changed, 169 insertions(+), 27 deletions(-) create mode 100755 config_files/sip-4.2.1.sh diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml index 7095cf2..a23fd5c 100755 --- a/config_Mandriva_2006.0.xml +++ b/config_Mandriva_2006.0.xml @@ -57,15 +57,15 @@ temporarydiskspace="48" script="msg2qm.sh"/> + installdiskspace="295" + temporarydiskspace="2057" + script="sip-4.2.1.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 40100 ] ; then return 0 fi fi @@ -26,33 +30,36 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" } # looks for the native product and collects it's environment (used by make_env()) +# we need version 4.1 or newer try_native(){ -sipdir="`find_in_path sip ${PATH}`" -if [ -z "${sipdir}" ] ; then - sipdir="`find_in_path sip /usr/bin`" -fi +sipdir="`find_in_path sip ${PATH}:/usr/bin`" if [ -n "${sipdir}" ] ; then python_version="`python -c 'import sys; print sys.version[:3]'`" - sippython="`find_in_path sip.so ${PYTHONPATH}`" - if [ -z "${sippython}" ] ; then - sippython="`find_in_path sip.so /usr/lib/python${python_version}/site-packages`" - fi + sippython="`find_in_path sip.so ${PYTHONPATH}:/usr/lib/python${python_version}/site-packages`" if [ -n "${sippython}" ]; then - tmp="${sipdir} ${sipdir} \${PATH} ${PATH}"; - path=`sort_path ${tmp}` - tmp="${sippython} ${sippython} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; - ld_library_path=`sort_path ${tmp}` - tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}"; - pythonpath=`sort_path ${tmp}` - cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.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 + # minimal required version is 4.1 + if [ $ver -ge 40100 ] ; then + tmp="${sipdir} ${sipdir} \${PATH} ${PATH}"; + path=`sort_path ${tmp}` + tmp="${sippython} ${sippython} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; + ld_library_path=`sort_path ${tmp}` + tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}"; + pythonpath=`sort_path ${tmp}` + cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.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 40201 ] ; then + return 0 + fi +fi +return 1 +} + +print_env() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.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 + # minimal required version is 4.1 + if [ $ver -ge 40100 ] ; then + tmp="${sipdir} ${sipdir} \${PATH} ${PATH}"; + path=`sort_path ${tmp}` + tmp="${sippython} ${sippython} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}"; + ld_library_path=`sort_path ${tmp}` + tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}"; + pythonpath=`sort_path ${tmp}` + cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${PRODUCT_DIR}/size.log +cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} +print_env +} + +install_binary() +{ +make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} +source ${INSTALL_WORK}/$SHRC + +check_jb tar xfz ${SOURCE_DIR}/sip-4.2.1.tar.gz -C ${INSTALL_ROOT} + +# modify sipconfig.py file +cd ${PRODUCT_DIR} +python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'` +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_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" sipconfig.py.1 > sipconfig.py +sed -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" sipconfig.py > sipconfig.py.1 +sed -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" sipconfig.py.1 > sipconfig.py +sed -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" sipconfig.py > sipconfig.py.1 +sed -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" sipconfig.py.1 > sipconfig.py +sed -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1 +sed -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/lib/python${PYTHON_VERSION}/config',%g" sipconfig.py.1 > sipconfig.py +sed -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g" sipconfig.py > sipconfig.py.1 +mv sipconfig.py.1 sipconfig.py + +print_env +} + +export PROCEDURE=$1; +export INSTALL_WORK=$2; +export SOURCE_DIR=$3; +export INSTALL_ROOT=$4; +export PRODUCT_SEQUENCE=$5; +if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="sip" ; fi +export PRODUCT="sip-4.2.1" +export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} +export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} +source ./common.sh +$PROCEDURE diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx index 657acd6..6551b47 100644 --- a/src/SALOME_InstallWizard.cxx +++ b/src/SALOME_InstallWizard.cxx @@ -1513,7 +1513,7 @@ void SALOME_InstallWizard::launchScript() QCheckListItem* item = mapIter.key(); Dependancies dep = mapIter.data(); QString depproducts = QUOTE( DefineDependeces(productsMap) ); - if ( dep.pickUpEnvironment() ) { + if ( !productsView->iSNone( item ) && dep.pickUpEnvironment() ) { ___MESSAGE___( "... for " << dep.getName() ); QString script; script += "cd " + QUOTE( QFileInfo( QDir::cleanDirPath( "./config_files/" ) ).absFilePath() ) + "; "; -- 2.39.2