From 74a951cddb99b4af7ea63ef419c859830d7dcaae Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 31 Oct 2007 13:25:32 +0000 Subject: [PATCH] Update for Salome 4X --- config_files/PyQt-3.13.sh | 139 ------------------ .../{PyQt-3.14.1.sh => PyQt-3.17.0.sh} | 6 +- .../{doxygen-1.4.6.sh => doxygen-1.4.7.sh} | 6 +- 3 files changed, 6 insertions(+), 145 deletions(-) delete mode 100755 config_files/PyQt-3.13.sh rename config_files/{PyQt-3.14.1.sh => PyQt-3.17.0.sh} (97%) rename config_files/{doxygen-1.4.6.sh => doxygen-1.4.7.sh} (98%) diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh deleted file mode 100755 index b8bd987..0000000 --- a/config_files/PyQt-3.13.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : PyQt-3.13.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 "${PYQTDIR}" ] && [ -f ${PYQTDIR}/pyqtconfig.py ] ; then - ver=`cd ${PYQTDIR} && python -c "from pyqtconfig import Configuration; c=Configuration();print c.__getattr__('pyqt_version_str')" 2>/dev/null` - if [ -n "$ver" ] ; then - 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 031300 ] ; then - return 0 - fi - fi -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < configure.py.new -mv -f configure.py.new configure.py - -check_job ${PRODUCT_DIR}/CONFIGURE.LOG \ - python configure.py -b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -v ${PRODUCT_DIR}/sip -GCC=`which gcc` -cat >> ${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 pyqtconfig.py file -cd ${PRODUCT_DIR} -sed -e "s%\('pyqt_bin_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" pyqtconfig.py > pyqtconfig.py.1 -sed -e "s%\('pyqt_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" pyqtconfig.py.1 > pyqtconfig.py -sed -e "s%\('pyqt_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" pyqtconfig.py > pyqtconfig.py.1 -mv pyqtconfig.py.1 pyqtconfig.py - -# to generate environment script for sources -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="PyQt-3.13" -export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} -export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} -source ./common.sh -$PROCEDURE diff --git a/config_files/PyQt-3.14.1.sh b/config_files/PyQt-3.17.0.sh similarity index 97% rename from config_files/PyQt-3.14.1.sh rename to config_files/PyQt-3.17.0.sh index 8467878..aefe96a 100755 --- a/config_files/PyQt-3.14.1.sh +++ b/config_files/PyQt-3.17.0.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : PyQt-3.14.1.sh +# File : PyQt-3.17.0.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -21,7 +21,7 @@ if [ -n "${PYQTDIR}" ] && [ -f ${PYQTDIR}/pyqtconfig.py ] ; 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 031401 ] ; then + if [ $ver -eq 031700 ] ; then return 0 fi fi @@ -136,7 +136,7 @@ export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; -export PRODUCT="PyQt-3.14.1" +export PRODUCT="PyQt-3.17.0" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh diff --git a/config_files/doxygen-1.4.6.sh b/config_files/doxygen-1.4.7.sh similarity index 98% rename from config_files/doxygen-1.4.6.sh rename to config_files/doxygen-1.4.7.sh index 7a8d5a5..eb68b94 100755 --- a/config_files/doxygen-1.4.6.sh +++ b/config_files/doxygen-1.4.7.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : doxygen-1.4.6.sh +# File : doxygen-1.4.7.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -23,7 +23,7 @@ maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\( 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 10406 ] ; then +if [ $ver -eq 10407 ] ; then return 0 fi return 1 @@ -144,7 +144,7 @@ export PRODUCT_TYPE=$6; export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; -export PRODUCT="doxygen-1.4.6" +export PRODUCT="doxygen-1.4.7" export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} source ./common.sh -- 2.39.2