From: vsr Date: Mon, 15 Jun 2009 13:53:38 +0000 (+0000) Subject: Rollback products: qt -> 4.4.3, sip -> 4.7.7, PyQt -> 4.4.3, qwt -> 5.1.1, QScintilla... X-Git-Tag: V5_1_2~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69677c5f786e30267c956a426c0bba5ddf1d4e1d;hp=ad913471074c68cd69b3effbcbc40fc0f946e226;p=tools%2Finstall.git Rollback products: qt -> 4.4.3, sip -> 4.7.7, PyQt -> 4.4.3, qwt -> 5.1.1, QScintilla -> 2.3 --- diff --git a/README b/README index 0b3dd51..094ca89 100644 --- a/README +++ b/README @@ -458,15 +458,16 @@ ./build.csh - By default, build.csh only compiles the modules but does not install them, - i.e. does not perform 'make install' step. - To do this, use -i option or -p where is the + By default, build.csh builds and installs all SALOME + modules. All modules are installed to the INSTALL subfolder + of the current directory. If you need to change the installation + directory, you can use -p option where is the directory SALOME modules should be installed to. - If you want to build only some SALOME modules, just pass them as - parameters, e.g.: + If you want to build only some subset of SALOME modules, + just pass them as parameters, e.g.: - ./build.csh -i KERNEL MED GEOM + ./build.csh -p /home/user/salome KERNEL MED GEOM The script also provides other options which specify compiling and installation parameters. You can learn about these options by using @@ -475,7 +476,7 @@ ./build.csh -h When you run build.csh for the first time it is not necessary to pass - -b, -c parameters. The script detects if build procedure has not yet + -b or -c parameters. The script detects if build procedure has not yet been performed and in this case runs build_configure, configure scripts automatically. @@ -487,12 +488,6 @@ Note: use -d option carefully because in this case the script removes the existing (previously installed) SALOME modules. - Note: please, take into your account that 'make install' step is - obligatory for the KERNEL module. Build directory of KERNEL - can not be indicated as KERNEL_ROOT_DIR. This is an exception - for the SALOME modules. So you should use either option -i - or -p of build.sch script when building KERNEL module. - Note: build.(c)sh scripts do not modify the environment files (env_products.csh, etc). You should do it by yourself. diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml index dd35532..531ce0a 100755 --- a/config_Debian_3.1.xml +++ b/config_Debian_3.1.xml @@ -310,37 +310,37 @@ type="prerequisite" description="Multiplatform C++ GUI application framework"> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> + script="qt-4.4.3.sh"/> + script="qscintilla-2.3.sh"/> + script="sip-4.7.7.sh"/> + script="PyQt-4.4.3.sh"/> + script="qwt-5.1.1.sh"/> /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 040403 ] ; 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 <> ${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%\('pyqt_bin_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \ + -e "s%\('pyqt_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \ + -e "s%\('pyqt_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \ + -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \ + -e "s%\('qt_data_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%\('pyqt_config_args':[[:space:]]*\).*%\1'${PYQT_CONFIGURE_OPTIONS}',%g" \ + pyqtconfig.py > pyqtconfig.py.1 + mv -f pyqtconfig.py.1 pyqtconfig.py + cd ${PRODUCT_DIR}/bin + sed -e "s%exec.*pyuic.py%exec ${PYTHONROOT}/bin/python ${PRODUCT_DIR}/PyQt4/uic/pyuic.py%g" pyuic4 > pyuic4.1 + mv -f pyuic4.1 pyuic4 && chmod a+x pyuic4 +fi + +# to generate environment script for sources +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="PyQt-4.4.3" +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/PyQt-4.4.4.sh b/config_files/PyQt-4.4.4.sh deleted file mode 100755 index fc9c92e..0000000 --- a/config_files/PyQt-4.4.4.sh +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : PyQt-4.4.4.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-2008 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 040403 ] ; 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 <> ${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%\('pyqt_bin_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \ - -e "s%\('pyqt_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \ - -e "s%\('pyqt_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \ - -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \ - -e "s%\('qt_data_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%\('pyqt_config_args':[[:space:]]*\).*%\1'${PYQT_CONFIGURE_OPTIONS}',%g" \ - pyqtconfig.py > pyqtconfig.py.1 - mv -f pyqtconfig.py.1 pyqtconfig.py - cd ${PRODUCT_DIR}/bin - sed -e "s%exec.*pyuic.py%exec ${PYTHONROOT}/bin/python ${PRODUCT_DIR}/PyQt4/uic/pyuic.py%g" pyuic4 > pyuic4.1 - mv -f pyuic4.1 pyuic4 && chmod a+x pyuic4 -fi - -# to generate environment script for sources -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="PyQt-4.4.4" -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/build.csh b/config_files/build.csh index 6ffee6a..79dbe7a 100755 --- a/config_files/build.csh +++ b/config_files/build.csh @@ -21,13 +21,14 @@ set inst_with_gui=1 set is_delete=0 set verbose_level=2 set params="" -set b_params="" -set modules=(KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER YACS) +set modules=(KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER) set optim="" -set is_install=0 +set is_install=1 set is_help=0 set is_tui=0 set prefix="" +set def_install_dir="/INSTALL" +set b_params="" ######################################################### # parse parameters @@ -44,8 +45,6 @@ while ( ${%1} > 0 ) set is_delete=1 else if ( "$1" == "-o" ) then set optim="--enable-production=yes --disable-debug" - else if ( "$1" == "-i" ) then - set is_install=1 else if ( "$1" == "-v" ) then shift set verbose_level=$1 @@ -58,12 +57,12 @@ while ( ${%1} > 0 ) else if ( "$1" == "-t" ) then set is_tui=1 else - set ckt=`echo ${modules} | grep $1` + set ckt=`echo ${modules} | grep -E "\<$1\>"` if ( "$ckt" != "" ) then set params="$params $1" else set b_params="$b_params $1" - echo "\!\!\! Warning \!\!\! Unknown module: $1. Skipping." + echo "\!\!\! Warning \!\!\! Unknown module: $1." endif endif shift @@ -96,8 +95,8 @@ echo "-w Add --without-gui key to build_configure and configure command echo " to build SALOME module sources without GUI." echo " By default sources are built with GUI." echo "" -echo "-d Delete build directories before calling configure, to enforce full rebuild" -echo " (and reinstall if -i or -p option is used) of module." +echo "-d Delete build directories before calling configure, to force full rebuild" +echo " and reinstall of the module." echo " Use this option carefully." echo "" echo "-o Build sources in optimized mode. Default is off that means debug mode." @@ -108,8 +107,6 @@ echo "" echo "-t Performs make dev_docs step to build TUI documentation for those modules" echo " which support this. Default is off." echo "" -echo "-i Performs make install step. Default is off that means only make step." -echo "" echo "-p Define the directory where to install modules after compilation." echo " By default the directory where compilation is performed is used." echo "" @@ -123,7 +120,7 @@ echo "" echo "Note: If no keys are given script just performs make step." echo "" echo "Example:" -echo " ./build.csh -o -i -b KERNEL MED GEOM" +echo " ./build.csh -o -p /home/user/salome -b KERNEL MED GEOM" echo "" echo " This will make KERNEL, GEOM and MED modules: build_configure, configure, make" echo " and install procedures will be performed for all specified modules." @@ -138,20 +135,17 @@ endif if ( "${params}" != "" ) then set xparams="" foreach module (${modules}) - set ckt=`echo ${params} | grep ${module}` + set ckt=`echo ${params} | grep -E "\<${module}\>"` if ( "$ckt" != "" ) then set xparams="$xparams $module" endif end - set modules=($xparams) -else - if ( "${b_params}" != "" ) then - echo "Nothing to be built. Exiting." - exit - endif + set modules=($xparams $b_params) +else if ( "${b_params}" != "" ) then + set modules=($b_params) endif -echo ">>> The following SALOME packages will be built:" +echo ">>> The following modules will be built:" echo $modules ######################################################### @@ -161,11 +155,16 @@ set env_script=`dirname $0`/env_build.csh if ( ! -e $env_script ) then set env_script=`dirname $0`/env_products.csh endif +if ( ! -e $env_script ) then + set env_script=`dirname $0`/env.sh +endif if ( -e $env_script ) then echo ">>> Setting environment" source $env_script else - echo "\!\!\! Warning \!\!\! Environment is not set: file env_products.csh is not found." + echo "\!\!\! Warning \!\!\! Environment is not set." + echo "No environment file (env_build.sh, env_products.sh, env.sh) is found." + echo "Proceed with the current environment." endif set BUILD_DIR=${PWD} @@ -175,18 +174,8 @@ set LOG_DIR=${BUILD_DIR}/LOGS # define installation prefix ######################################################### if ( "$prefix" == "" ) then - set prefix=${BUILD_DIR}/INSTALL - if ( $is_install == 1 ) then - echo "\!\!\! Warning \!\!\! Installation directory is not set." - echo "All the modules will be installed to the $prefix" - else - set is_kernel=`echo ${modules} | grep KERNEL` - if ( "$is_kernel" != "" ) then - echo "\!\!\! Warning \!\!\! KERNEL module requires install step to be performed." - echo "For this module -i option will be forced." - echo "The module(s) will be installed to the $prefix" - endif - endif + echo "\!\!\! Warning \!\!\! Installation directory is not set." + echo "All the modules will be installed to the ${BUILD_DIR}${def_install_dir}" else set is_absolute=`echo $prefix | grep -e "^/"` if ( "$is_absolute" == "" ) then @@ -217,7 +206,6 @@ foreach module (${modules}) set module_build=${BUILD_DIR}/${module}_BUILD if ( ${module_src} != "" ) then - set add_keys="" cd ${BUILD_DIR} ######################################################### # check if sources directory exists @@ -248,11 +236,12 @@ foreach module (${modules}) ######################################################### # call build_configure ######################################################### + set mybuildconf_keys="${BUILDCONF_OPTS}" if ( $inst_with_gui == 0 ) then - set add_keys="--without-gui" + set mybuildconf_keys="${mybuildconf_keys} --without-gui" endif cd ${module_src} - ./build_configure ${add_keys} >& ${LOG_DIR}/build_configure_${module}.log + ./build_configure ${mybuildconf_keys} >& ${LOG_DIR}/build_configure_${module}.log ######################################################### # echo possible errors ######################################################### @@ -266,13 +255,20 @@ foreach module (${modules}) ######################################################### if ( -e ${module_build} && $is_delete == 1 ) then echo "... Removing ${module_build}" - rm -rf ${module_build} + chmod -R +w ${module_build} && rm -rf ${module_build} >& /dev/null + if ( "$?" != "0" ) then + echo "\!\!\! Warning \!\!\! Cannot remove build directory ${module_build}. Permission denied." + endif endif ######################################################### # creating build directory if it does not exist ######################################################### if ( ! -e ${module_build} ) then - mkdir -p ${module_build} + mkdir -p ${module_build} >& /dev/null + if ( "$?" != "0" ) then + echo "\!\!\! Error \!\!\! Cannot create build directory ${module_build}. Permission denied." + continue + endif endif cd ${module_build} ######################################################### @@ -299,22 +295,26 @@ foreach module (${modules}) # number); default is a build directory ######################################################### set vx="" - set cfg_file=configure.ac - if ( ! -e ${module_src}/${cfg_file} ) then - set cfg_file=configure.in.base - endif - if ( -e ${module_src}/${cfg_file} ) then - set vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'` + if ( -e ${module_src}/configure.ac ) then + set vx=`grep -e "^AC_INIT" ${module_src}/configure.ac | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` + else if ( -e ${module_src}/configure.in.base ) then + set vx=`grep -e "^VERSION=" ${module_src}/configure.in.base | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'` if ( "$vx" == "" ) then - set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` + set vx=`grep -e "^AC_INIT" ${module_src}/configure.in.base | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` endif endif - set px=${BUILD_DIR}/${module} - if ( "$prefix" != "" ) then - set px=$prefix/${module} - endif if ( "$vx" != "" ) then - set px="$px"_"$vx" + set vx="_$vx" + endif + if ( "$prefix" == "" ) then + #set module_root_dir=`printenv ${module}_ROOT_DIR` + #if ( "$module_root_dir" != "" ) then + # set px=$module_root_dir + #else + set px=${BUILD_DIR}${def_install_dir}/${module}${vx} + #endif + else + set px=${prefix}/${module}${vx} endif ######################################################### # perform configure if -c flag is given or if @@ -328,16 +328,17 @@ foreach module (${modules}) if ( ! -e ${module_src}/configure ) then echo "\!\!\! Warning \!\!\! Can not find configure script in ${module_src}." else + set myconf_keys="${CONF_OPTS}" if ( $inst_with_gui == 0 ) then - set add_keys="--without-gui" + set myconf_keys="${myconf_keys} --without-gui" endif - if ( "${module}" == "MED" && ($?METISDIR) && ($?SCOTCHDIR) ) then - set add_keys="--enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}" + if ( "${module}" == "MED" && ($?METISDIR) && ($?SCOTCHDIR) ) then + set myconf_keys="${myconf_keys} --enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}" endif if ( "${module}" == "NETGENPLUGIN" && ($?NETGENHOME) ) then - set add_keys="--with-netgen=${NETGENHOME}" + set myconf_keys="${myconf_keys} --with-netgen=${NETGENHOME}" endif - ${module_src}/configure --prefix=$px ${optim} ${add_keys} >& ${LOG_DIR}/configure_${module}.log + ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log ######################################################### # echo possible errors ######################################################### @@ -363,9 +364,9 @@ foreach module (${modules}) # if make step is successful set the ${module}_ROOT_DIR # environment variable ######################################################### - if ( $sts == 0 ) then - setenv ${module}_ROOT_DIR ${module_build} - endif + #if ( $sts == 0 ) then + # setenv ${module}_ROOT_DIR ${module_build} + #endif ######################################################### # print make errors ######################################################### @@ -405,7 +406,10 @@ foreach module (${modules}) ######################################################### if ( -e $px && $is_delete == 1 ) then echo "... Removing $px" - rm -rf $px + rm -rf $px >& /dev/null + if ( "$?" != "0" ) then + echo "\!\!\! Warning \!\!\! Cannot remove install directory ${px}. Permission denied." + endif endif echo "... Performing make install" make install >& ${LOG_DIR}/make_install_${module}.log diff --git a/config_files/build.sh b/config_files/build.sh index 178cae2..56f8c5a 100755 --- a/config_files/build.sh +++ b/config_files/build.sh @@ -42,8 +42,8 @@ usage(){ echo " to build SALOME module sources without GUI." echo " By default sources are built with GUI." echo "" - echo "-d Delete build directories before calling configure, to enforce full" - echo " rebuild (and reinstall if -i or -p option is used) of module." + echo "-d Delete build directories before calling configure, to force full" + echo " rebuild and reinstall of the module." echo " Use this option carefully." echo "" echo "-o Build sources in optimized mode. Default is off that means" @@ -56,9 +56,6 @@ usage(){ echo "-t Performs make dev_docs step to build TUI documentation for those" echo " modules which support this. Default is off." echo "" - echo "-i Performs make install step. Default is off that means only make" - echo " step." - echo "" echo "-p Define the directory where to install modules after compilation." echo " By default the directory where compilation is performed is used." echo "" @@ -72,7 +69,7 @@ usage(){ echo "Note: If no keys are given script just performs make step." echo "" echo "Example:" - echo " ./build.csh -o -i -b KERNEL MED GEOM" + echo " ./build.csh -o -p /home/user/salome -b KERNEL MED GEOM" echo "" echo " This will make KERNEL, GEOM and MED modules: build_configure," echo " configure, make and install procedures will be performed for all" @@ -87,17 +84,17 @@ inst_with_gui=1 is_delete=0 verbose_level=2 params="" -b_params="" -modules="KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER YACS" +modules="KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER" optim="" -is_install=0 +is_install=1 is_tui=0 prefix="" +def_install_dir="/INSTALL" ######################################################### # parse parameters ######################################################### -while getopts ":hbcwdoitv:p:" option ; do +while getopts ":hbcwdotv:p:" option ; do case $option in h ) usage ;; b ) is_build_configure=1 ; is_configure=1 ;; @@ -105,7 +102,6 @@ while getopts ":hbcwdoitv:p:" option ; do w ) inst_with_gui=0 ;; d ) is_delete=1 ;; o ) optim="--enable-production=yes --disable-debug" ;; - i ) is_install=1 ;; t ) is_tui=1 ;; v ) verbose_level=$OPTARG ;; p ) is_install=1 ; prefix=$OPTARG ;; @@ -115,17 +111,19 @@ done # shift to have the good number of other args shift $((OPTIND - 1)) +b_params="" + for arg in $@ ; do known=0 for m in $modules ; do if [ "$m" == "$arg" ] ; then known=1 ; break ; fi done - if [ $known -eq 1 ] ; then - params="$params $arg" - else - b_params="$b_params $arg" + if [ $known -eq 0 ] ; then echo - echo '!!! Warning !!! Unknown module: '$arg'. Skipping.' + echo '!!! Warning !!! Unknown module: '$arg'.' + b_params="$b_params $arg" + else + params="$params $arg" fi done @@ -139,19 +137,19 @@ if [ "${params}" != "" ] ; then for p in $params ; do if [ "$p" == "$module" ] ; then found=1 ; break ; fi done - if [ $found -eq 1 ] ; then xparams="$xparams $module" ; fi + if [ $found -eq 1 ] ; then + xparams="$xparams $module" + fi done - modules="$xparams" + modules="$xparams $b_params" elif [ "${b_params}" != "" ] ; then - echo - echo "Nothing to be built. Exiting." - echo - exit 1 + modules="$b_params" fi echo -echo ">>> The following SALOME packages will be built:" +echo ">>> The following modules will be built:" echo $modules +echo ######################################################### # set environment @@ -160,6 +158,9 @@ env_script=`dirname $0`/env_build.sh if [ ! -e $env_script ] ; then env_script=`dirname $0`/env_products.sh fi +if [ ! -e $env_script ] ; then + env_script=`dirname $0`/env.sh +fi if [ -e $env_script ] ; then echo echo ">>> Setting environment" @@ -167,7 +168,7 @@ if [ -e $env_script ] ; then else echo echo '!!! Warning !!! Environment is not set.' - echo 'Neither env_build.sh nor env_products.sh file is found.' + echo 'No environment file (env_build.sh, env_products.sh, env.sh) is found.' echo 'Proceed with the current environment.' fi @@ -178,17 +179,9 @@ LOG_DIR=${BUILD_DIR}/LOGS # define installation prefix ######################################################### if [ "$prefix" == "" ] ; then - prefix=${BUILD_DIR}/INSTALL - if [ $is_install -eq 1 ] ; then - echo - echo '!!! Warning !!! Installation directory is not set.' - echo "All the modules will be installed to the $prefix" - elif [ "`echo ${modules} | grep KERNEL`" != "" ] ; then - echo - echo '!!! Warning !!! KERNEL module requires install step to be performed.' - echo "For this module -i option will be forced." - echo "The module(s) will be installed to the $prefix" - fi + echo + echo '!!! Warning !!! Installation directory is not set.' + echo "All the modules will be installed to the ${BUILD_DIR}${def_install_dir}" else if [ "`echo $prefix | grep -E '^/'`" == "" ] ; then prefix=${BUILD_DIR}/$prefix @@ -221,7 +214,6 @@ for module in ${modules}; do module_build=${BUILD_DIR}/${module}_BUILD if [ "${module_src}" != "" ] ; then - add_keys="" cd ${BUILD_DIR} ######################################################### # check if sources directory exists @@ -255,11 +247,12 @@ for module in ${modules}; do ######################################################### # call build_configure ######################################################### + mybuildconf_keys="${BUILDCONF_OPTS}" if [ $inst_with_gui -eq 0 ] ; then - add_keys="--without-gui" + mybuildconf_keys="${mybuildconf_keys} --without-gui" fi cd ${module_src} - ./build_configure ${add_keys} >& ${LOG_DIR}/build_configure_${module}.log + ./build_configure ${mybuildconf_keys} >& ${LOG_DIR}/build_configure_${module}.log ######################################################### # echo possible errors ######################################################### @@ -273,13 +266,24 @@ for module in ${modules}; do ######################################################### if [ -e ${module_build} ] && [ $is_delete -eq 1 ] ; then echo "... Removing ${module_build}" - rm -rf ${module_build} + chmod -R +w ${module_build} && rm -rf ${module_build} >& /dev/null + if [ "$?" != "0" ] ; then + echo + echo '!!! Warning !!! Cannot remove build directory ${module_build}. Permission denied.' + echo + fi fi ######################################################### # creating build directory if it does not exist ######################################################### if [ ! -e ${module_build} ] ; then - mkdir -p ${module_build} + mkdir -p ${module_build} >& /dev/null + if [ "$?" != "0" ] ; then + echo + echo '!!! Error !!! Cannot create build directory ${module_build}. Permission denied.' + echo + continue + fi fi cd ${module_build} ######################################################### @@ -306,22 +310,26 @@ for module in ${modules}; do # number); default is a build directory ######################################################### vx="" - cfg_file=configure.ac - if [ ! -e ${module_src}/${cfg_file} ] ; then - cfg_file=configure.in.base - fi - if [ -e ${module_src}/${cfg_file} ] ; then - vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'` + if [ -e ${module_src}/configure.ac ] ; then + vx=`grep -e "^AC_INIT" ${module_src}/configure.ac | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` + elif [ -e ${module_src}/configure.in.base ] ; then + vx=`grep -e "^VERSION=" ${module_src}/configure.in.base | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'` if [ "$vx" == "" ] ; then - vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` + vx=`grep -e "^AC_INIT" ${module_src}/configure.in.base | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"` fi fi - px=${BUILD_DIR}/${module} - if [ "$prefix" != "" ] ; then - px=$prefix/${module} - fi if [ "$vx" != "" ] ; then - px="$px"_"$vx" + vx="_$vx" + fi + if [ "$prefix" == "" ] ; then + #module_root_dir=`printenv ${module}_ROOT_DIR` + #if [ "$module_root_dir" != "" ] ; then + # px=$module_root_dir + #else + px=${BUILD_DIR}${def_install_dir}/${module}${vx} + #fi + else + px=$prefix/${module}${vx} fi ######################################################### # perform configure if -c flag is given or if @@ -337,16 +345,17 @@ for module in ${modules}; do echo '!!! Warning !!! Can not find configure script in '${module_src}'.' echo else + myconf_keys="${CONF_OPTS}" if [ $inst_with_gui -eq 0 ] ; then - add_keys="--without-gui" + myconf_keys="${myconf_keys} --without-gui" fi - if [ "${module}" == "MED" ] && [ "${METISDIR}" != "" ] && [ "${SCOTCHDIR}" != "" ] ; then - add_keys="--enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}" + if [ "${module}" == "MED" ] && [ "${METISDIR}" != "" ] && [ "${SCOTCHDIR}" != "" ] ; then + myconf_keys="${myconf_keys} --enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}" fi if [ "${module}" == "NETGENPLUGIN" ] && [ "$NETGENHOME" != "" ] ; then - add_keys="--with-netgen=${NETGENHOME}" + myconf_keys="${myconf_keys} --with-netgen=${NETGENHOME}" fi - ${module_src}/configure --prefix=$px ${optim} ${add_keys} >& ${LOG_DIR}/configure_${module}.log + ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log ######################################################### # echo possible errors ######################################################### @@ -372,9 +381,9 @@ for module in ${modules}; do # if make step is successful set the ${module}_ROOT_DIR # environment variable ######################################################### - if [ $sts -eq 0 ] ; then - export ${module}_ROOT_DIR=${module_build} - fi + #if [ $sts -eq 0 ] ; then + # export ${module}_ROOT_DIR=${module_build} + #fi ######################################################### # print make errors ######################################################### @@ -414,7 +423,12 @@ for module in ${modules}; do ######################################################### if [ -e $px ] && [ $is_delete -eq 1 ] ; then echo "... Removing $px" - rm -rf $px + rm -rf $px >& /dev/null + if [ "$?" != "0" ] ; then + echo + echo '!!! Warning !!! Cannot remove install directory ${px}. Permission denied.' + echo + fi fi echo "... Performing make install" make install >& ${LOG_DIR}/make_install_${module}.log diff --git a/config_files/common.sh b/config_files/common.sh index beaff54..0c82b35 100755 --- a/config_files/common.sh +++ b/config_files/common.sh @@ -843,7 +843,7 @@ if [ "$l" != "X" ] ; then # 20. process QScintilla-2.3 dependencies qscintilladir=`printenv QSCINTILLA_DIR`/lib if [ ! -d ${qscintilladir} ] ; then qscintilladir=`printenv QSCINTILLA_DIR`/lib ; fi - sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\.[0-9]/lib% \1${qscintilladir}%g" $l > $l"_" + sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\(\.[0-9]\)\?/lib% \1${qscintilladir}%g" $l > $l"_" chmod -f --reference=$l $l"_" mv -f $l"_" $l diff --git a/config_files/qscintilla-2.3.2.sh b/config_files/qscintilla-2.3.2.sh deleted file mode 100755 index 4d21391..0000000 --- a/config_files/qscintilla-2.3.2.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : qscintilla-2.3.2.sh -# Created : Thu Oct 23 11:50:00 2008 -# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) -# Project : SALOME -# Module : Installation Wizard -# Copyright : 2002-2008 CEA -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -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.3.2" ] ; then - return 0 -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < qscintilla.pro.new -mv -f qscintilla.pro.new qscintilla.pro - -qmake -o Makefile qscintilla.pro -check_job ${PRODUCT_DIR}/MAKE.LOG make -check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install - -if [ "${INSTALL_ROOT_PREV}" != "" ] ; then - export INSTALL_ROOT=$INSTALL_ROOT_PREV -fi - -#rm -rf ${PRODUCT_DIR}/doc -#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log -cd ${PRODUCT_DIR}; - -# remove sources and temporary files after building -if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then - test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR} -fi - -# to generate environment scripts -try_preinstalled -} - -install_binary() -{ -make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} -source ${INSTALL_WORK}/$SHRC - -# create a product directory -test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} - -check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} - -# 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="QScintilla-2.3.2" -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/qscintilla-2.3.sh b/config_files/qscintilla-2.3.sh new file mode 100755 index 0000000..1e3ce30 --- /dev/null +++ b/config_files/qscintilla-2.3.sh @@ -0,0 +1,140 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : qscintilla-2.3.sh +# Created : Thu Oct 23 11:50:00 2008 +# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) +# Project : SALOME +# Module : Installation Wizard +# Copyright : 2002-2008 CEA +# +# This script is the part of the SALOME installation procedure. +# +#################################################################################### + +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.3" ] ; then + return 0 +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < qscintilla.pro.new +mv -f qscintilla.pro.new qscintilla.pro + +qmake -o Makefile qscintilla.pro +check_job ${PRODUCT_DIR}/MAKE.LOG make +check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install + +if [ "${INSTALL_ROOT_PREV}" != "" ] ; then + export INSTALL_ROOT=$INSTALL_ROOT_PREV +fi + +#rm -rf ${PRODUCT_DIR}/doc +#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log +cd ${PRODUCT_DIR}; + +# remove sources and temporary files after building +if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then + test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR} +fi + +# to generate environment scripts +try_preinstalled +} + +install_binary() +{ +make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE} +source ${INSTALL_WORK}/$SHRC + +# create a product directory +test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} + +check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} + +# 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="QScintilla-2.3" +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/qt-4.4.3.sh b/config_files/qt-4.4.3.sh new file mode 100755 index 0000000..b1ce675 --- /dev/null +++ b/config_files/qt-4.4.3.sh @@ -0,0 +1,176 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : qt-4.4.3.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-2008 CEA +# +# This script is the part of the SALOME installation procedure. +# +#################################################################################### + +QT_REF_VERSION="4.4.3" + +check_version(){ +if [ -z "$QTDIR" ]; then + return 1 +fi +ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` +if [ "$ver" == "${QT_REF_VERSION}" ] ; then + return 0 +fi +return 1 +} + +print_env_bin() +{ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG < $l"_" +chmod -f --reference=$l $l"_" ; mv -f $l"_" $l +sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_" +chmod -f --reference=$l $l"_" ; mv -f $l"_" $l +sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_" +chmod -f --reference=$l $l"_" ; mv -f $l"_" $l + +done + +# modify libGL.so flags +has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la` +gllibdir="`where_gl_libs`" +if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then + sed -e "s%-lGL\b%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \ + libQtOpenGL.la > libQtOpenGL.la.new + mv -f libQtOpenGL.la.new libQtOpenGL.la +fi + +# modify qt package config +cd ${PRODUCT_DIR}/lib/pkgconfig +for l in X `find . -name "*.pc"`; do + if [ "${l}" != "X" ] ; then + sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \ + -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ + -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ + -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \ + -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \ + ${l} > ${l}_ + chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} + fi +done + +# generate qt.conf file +cat > ${PRODUCT_DIR}/bin/qt.conf < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <\2%g" \ - examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 - mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp - -# configure -check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -confirm-license -opensource - -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG < $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l -sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l -sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l - -done - -# modify libGL.so flags -has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la` -gllibdir="`where_gl_libs`" -if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then - sed -e "s%-lGL\b%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \ - libQtOpenGL.la > libQtOpenGL.la.new - mv -f libQtOpenGL.la.new libQtOpenGL.la -fi - -# modify qt package config -cd ${PRODUCT_DIR}/lib/pkgconfig -for l in X `find . -name "*.pc"`; do - if [ "${l}" != "X" ] ; then - sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \ - -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ - -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ - -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \ - -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \ - ${l} > ${l}_ - chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} - fi -done - -# generate qt.conf file -cat > ${PRODUCT_DIR}/bin/qt.conf < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <\2%g" \ - examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 - mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp - -# configure -check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -confirm-license -opensource - -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG < $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l -sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l -sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l - -done - -# modify libGL.so flags -has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la` -gllibdir="`where_gl_libs`" -if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then - sed -e "s%-lGL\b%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \ - libQtOpenGL.la > libQtOpenGL.la.new - mv -f libQtOpenGL.la.new libQtOpenGL.la -fi - -# modify qt package config -cd ${PRODUCT_DIR}/lib/pkgconfig -for l in X `find . -name "*.pc"`; do - if [ "${l}" != "X" ] ; then - sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \ - -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ - -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ - -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \ - -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \ - ${l} > ${l}_ - chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} - fi -done - -# generate qt.conf file -cat > ${PRODUCT_DIR}/bin/qt.conf < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < qwtconfig.pri.new +mv qwtconfig.pri.new qwtconfig.pri + +sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \ + designer/designer.pro > designer/designer.pro.new +mv designer/designer.pro.new designer/designer.pro + +INSTALL_ROOT_PREV=$INSTALL_ROOT +unset INSTALL_ROOT + +qmake + +GCC=`which gcc` +cat >> ${PRODUCT_DIR}/MAKE.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh < qwtconfig.pri.new -mv qwtconfig.pri.new qwtconfig.pri - -sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \ - designer/designer.pro > designer/designer.pro.new -mv designer/designer.pro.new designer/designer.pro - -INSTALL_ROOT_PREV=$INSTALL_ROOT -unset INSTALL_ROOT - -qmake - -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG <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 40502 ] ; 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-4.7.7" +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-4.7.9.sh b/config_files/sip-4.7.9.sh deleted file mode 100755 index 61d978c..0000000 --- a/config_files/sip-4.7.9.sh +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : sip-4.7.9.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-2008 CEA -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -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 40502 ] ; 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-4.7.9" -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/doc/batchmode.png b/doc/batchmode.png index 3432946..7d05041 100644 Binary files a/doc/batchmode.png and b/doc/batchmode.png differ diff --git a/doc/choicepage.png b/doc/choicepage.png index 7c99728..9bd4072 100755 Binary files a/doc/choicepage.png and b/doc/choicepage.png differ diff --git a/doc/directorypage.png b/doc/directorypage.png index fafc989..7ba384a 100644 Binary files a/doc/directorypage.png and b/doc/directorypage.png differ diff --git a/doc/installtypepage.png b/doc/installtypepage.png index 8359d54..a88be16 100644 Binary files a/doc/installtypepage.png and b/doc/installtypepage.png differ diff --git a/doc/intropage.png b/doc/intropage.png index de29d06..0ab59ed 100755 Binary files a/doc/intropage.png and b/doc/intropage.png differ diff --git a/doc/platformpage.png b/doc/platformpage.png index cfbf60c..d3cb2a3 100644 Binary files a/doc/platformpage.png and b/doc/platformpage.png differ diff --git a/doc/productpage1.png b/doc/productpage1.png index 1033c0c..1c1ca36 100644 Binary files a/doc/productpage1.png and b/doc/productpage1.png differ diff --git a/doc/productpage2.png b/doc/productpage2.png index dc39f2e..86543ce 100644 Binary files a/doc/productpage2.png and b/doc/productpage2.png differ diff --git a/doc/productpage3.png b/doc/productpage3.png index 7c2db8b..2ff3dcd 100644 Binary files a/doc/productpage3.png and b/doc/productpage3.png differ diff --git a/doc/productpage4.png b/doc/productpage4.png index 9f0de36..b48fada 100644 Binary files a/doc/productpage4.png and b/doc/productpage4.png differ diff --git a/doc/progresspage1.png b/doc/progresspage1.png index 465ce58..bf9c81e 100644 Binary files a/doc/progresspage1.png and b/doc/progresspage1.png differ diff --git a/doc/progresspage2.png b/doc/progresspage2.png index 50cc18b..f63ebcf 100644 Binary files a/doc/progresspage2.png and b/doc/progresspage2.png differ diff --git a/doc/readme.html b/doc/readme.html index 9dfc60d..b3cb7ca 100755 --- a/doc/readme.html +++ b/doc/readme.html @@ -36,7 +36,7 @@ Wizard Help
updated for the version 5.1.1
+ color="#ff0000">5.1.2