From 92b674c0b8f0b87152d1ab1fc47afd3c072ebd23 Mon Sep 17 00:00:00 2001 From: akl Date: Tue, 2 Apr 2013 11:46:33 +0000 Subject: [PATCH] Update build procedure of products for SALOME 7. --- config_files/DISTENE.sh | 2 +- config_files/OCCT.sh | 18 +++-- config_files/ParaView.sh | 152 +++++++++++++++++------------------ config_files/PyQt.sh | 18 +++-- config_files/Python.sh | 7 +- config_files/Sphinx.sh | 13 ++- config_files/boost.sh | 59 ++------------ config_files/cgnslib.sh | 2 +- config_files/cmake.sh | 4 +- config_files/docutils.sh | 9 ++- config_files/doxygen.sh | 22 ++--- config_files/expat.sh | 2 +- config_files/freeimage.sh | 22 ++++- config_files/freetype.sh | 4 +- config_files/ftgl.sh | 2 +- config_files/gl2ps.sh | 4 +- config_files/graphviz.sh | 9 ++- config_files/hdf5.sh | 5 +- config_files/homard.sh | 2 +- config_files/libxml2.sh | 15 ++-- config_files/med.sh | 11 +-- config_files/metis.sh | 9 ++- config_files/netgen.sh | 19 ++--- config_files/numpy.sh | 31 +++---- config_files/omniORB.sh | 38 ++++++--- config_files/qscintilla.sh | 25 +++--- config_files/qt.sh | 31 +++++-- config_files/qwt.sh | 34 ++++---- config_files/scotch.sh | 9 ++- config_files/sip.sh | 5 +- config_files/swig.sh | 14 ++-- config_files/tbb30_018oss.sh | 2 +- config_files/tcltk.sh | 39 ++++++--- 33 files changed, 345 insertions(+), 293 deletions(-) diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh index bdb956a..49f999a 100755 --- a/config_files/DISTENE.sh +++ b/config_files/DISTENE.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # diff --git a/config_files/OCCT.sh b/config_files/OCCT.sh index 73ac34a..5ddcde9 100755 --- a/config_files/OCCT.sh +++ b/config_files/OCCT.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # Open CASCADE Technology version # -OCCT_VERSION=6.5.4 +OCCT_VERSION=6.5.5 check_version() { @@ -41,6 +41,7 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_SRC_DIR}/VTK/Wrapping/Python/CMakeLists.txt && \ + sed -i "s%VTK_PYTHON_LIBRARIES})%VTK_PYTHON_LIBRARIES} pthread util)%g" ${PRODUCT_SRC_DIR}/ParaViewCore/PythonSupport/CMakeLists.txt && \ + sed -i "s%PYTHON_UTIL_LIBRARY_LIB}%PYTHON_UTIL_LIBRARY_LIB} pthread dl%g" ${PRODUCT_SRC_DIR}/ThirdParty/QtTesting/vtkqttesting/CMakeLists.txt fi -# 2. patch for missing PyVTKMutableObject.h (ParaView 3.10 development version) [OBSOLETE (fixed in 3.10.1)] -need_patch_mutable=0 -if [ "${need_patch_mutable}" == "1" ] ; then - ( cd ${PRODUCT_SRC_DIR} && grep "PyVTKMutableObject.h" VTK/Wrapping/Python/CMakeLists.txt >& /dev/null || \ - sed -i "s%\([[:space:]]*\)PyVTKSpecialObject.h%\1PyVTKSpecialObject.h\n\1PyVTKMutableObject.h%g" \ - VTK/Wrapping/Python/CMakeLists.txt ) +# 2. +local patch_surface_lic=1 +if [ "${patch_surface_lic}" == "1" -a -f ${SRCDIR}/patches/surface_lic.png ] ; then + echo -n ".. Patching ParaView sources: fix problem with SurfaceLIC plugin..." && \ + cp -f ${SRCDIR}/patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc fi -# 3. patch for ftgl (incompatibility with OCCT 6.5) [OBSOLETE (fixed in 3.12.0)] -need_patch_ftgl=0 -if [ "${need_patch_ftgl}" == "1" ] ; then - cp patches/paraview-3.10.1-ftgl.patch ${PRODUCT_SRC_DIR} - ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < paraview-3.10.1-ftgl.patch ) +# 3. +local patch_topological_sort=1 +if [ "${patch_topological_sort}" == "1" ] ; then + echo -n ".. Patching ParaView sources: fix about missing TopologicalSort.cmake..." && \ + sed -i "s%CMake/vtkWrapTcl.cmake%CMake/vtkWrapTcl.cmake\n\t\tCMake/TopologicalSort.cmake%" ${PRODUCT_SRC_DIR}/VTK/CMake/vtkModuleTop.cmake fi -# 4. patch hang-up of the compiler on some platforms when building SurfaceLIC plug-in (v3.14.0) -need_patch_surfaceLic=1 -if [ "${need_patch_surfaceLic}" == "1" ] ; then - ( test -f patches/surface_lic.png && cp -f patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc ) -fi -# 5. patch for missing doc generation files (v3.14.0) -need_patch_plugindoc=1 -if [ "${need_patch_plugindoc}" == "1" ] ; then - ( test -f patches/paraview-3.14.0-plugindoc.patch && cp -f patches/paraview-3.14.0-plugindoc.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < paraview-3.14.0-plugindoc.patch ) +# 4. +local patch_missing_headers=1 +if [ "${patch_missing_headers}" == "1" ] ; then + echo -n ".. Patching ParaView sources: fix about missing missing pq3DWidget.h and others header files..." && \ + cat >> ${PRODUCT_SRC_DIR}/Qt/Components/CMakeLists.txt < ${PRODUCT_DIR}/CONFIGURE.LOG < ${PRODUCT_DIR}/MAKE.LOG <& /dev/null && \ + sed -i "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/bin/\([^/]\+\"\)%\1${PRODUCT_DIR}/bin/\2%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /dev/null && \ + sed -i "s%[^;\"]\+/qt-[0-9\.]\+/lib/\([^;]\+\)%${QTDIR}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /dev/null && \ + sed -i "s%[^;\"]\+/Python-[0-9\.]\+/lib/\([^;]\+\)%${PYTHONROOT}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /dev/null && \ + sed -i "s%[^;\"]\+/hdf5-[0-9\.]\+/lib/\([^;]\+\)%${HDF5HOME}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /dev/null && \ + sed -i "s%[^;\"]\+/gl2ps-[0-9\.]\+/lib/\([^;]\+\)%${GL2PSHOME}/lib/\1%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /dev/null && \ + cp -f ${PRODUCT_SRC_DIR}/VTK/CMake/vtkTestingMacros.cmake ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION} && \ + sed -i "s%include(\".*/vtkTestingMacros.cmake\")%include(\"\${VTK_INSTALL_PREFIX}/lib/cmake/paraview-${PVLIBVERSION}/vtkTestingMacros.cmake\")%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKConfig.cmake >& /dev/null fi cd ${PRODUCT_DIR} diff --git a/config_files/PyQt.sh b/config_files/PyQt.sh index 8954bf2..1561948 100755 --- a/config_files/PyQt.sh +++ b/config_files/PyQt.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # PyQt version # -PYQT_VERSION=4.9.1 +PYQT_VERSION=4.9.6 PYQT_XVERSION=`echo ${PYQT_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` check_version() @@ -40,6 +40,7 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <shapshot()%g" ${PRODUCT_SRC_DIR}/configure.py >& /dev/null +fi + # apply additional patch (if there's any) ( test -f patches/${PRODUCT}.patch && cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < ${PRODUCT}.patch ) diff --git a/config_files/Python.sh b/config_files/Python.sh index d07929f..79e9576 100755 --- a/config_files/Python.sh +++ b/config_files/Python.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # Python version # -PY_VERSION=2.6.6 +PY_VERSION=2.7.3 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)}'` @@ -42,6 +42,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <&/dev/null -if [ "$?" != "0" ] ; then - added=0 - for v in XXX ${py_versions} ; do - if [ "${v}" == "XXX" ] ; then continue ; fi - vx=`echo ${v} | awk -F. '{print $1*100+$2}'` - if [ ${python_xversion} -gt ${vx} ] && [ ${added} -eq 0 ]; then - vv="${vv} ${python_version}" ; added=1 - elif [ ${python_xversion} -eq ${vx} ] ; then - continue - fi - vv="${vv} ${v}" - done - if [ ${added} -eq 0 ]; then - vv="${vv} ${python_version}" - fi - chmod +w ./build.jam && sed -i "s%for local v in\( [0-9]\.[0-9]\)\+%for local v in${vv}%g" ./build.jam -fi - GCC=`which gcc` cat >> ${PRODUCT_DIR}/BUILD.LOG <\)%\1\n#include %g' ./boost/limits.hpp -sed -i 's%\(#.*include.*\)%\1\n#include %g' ./boost/wave/util/flex_string.hpp - -if test `uname -m` = "x86_64" ; then - export binfolder=bin.linuxx86_64.debug -else - export binfolder=bin.linuxx86.debug -fi - -OPTIONS="toolset=gcc variant=release" -OPTIONS="${OPTIONS} runtime-link=shared threading=multi" -OPTIONS="${OPTIONS} -sBOOST_ALL_DYN_LINK=1 -sNO_BZIP2=1" -OPTIONS="${OPTIONS} --prefix=${PRODUCT_DIR} --builddir=${PRODUCT_SRC_DIR} install" +# make & install +cd ${PRODUCT_SRC_DIR} -echo "`pwd` -> ./tools/build/v2/engine/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG" -./tools/build/v2/engine/${binfolder}/bjam ${OPTIONS} >> ${PRODUCT_DIR}/INSTALL.LOG 2> $INSTALL_WORK/errlog +./b2 --prefix=${PRODUCT_DIR} toolset=gcc variant=release runtime-link=shared threading=multi --build-dir=${PRODUCT_BUILD_DIR} install >& ${PRODUCT_DIR}/INSTALL.LOG if [ "$?" -ne "0" ] ; then cat ${PRODUCT_DIR}/INSTALL.LOG diff --git a/config_files/cgnslib.sh b/config_files/cgnslib.sh index 6f7aa5d..01ef484 100755 --- a/config_files/cgnslib.sh +++ b/config_files/cgnslib.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # diff --git a/config_files/cmake.sh b/config_files/cmake.sh index 099f457..d3ceb01 100755 --- a/config_files/cmake.sh +++ b/config_files/cmake.sh @@ -6,13 +6,13 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # #################################################################################### -CMAKE_VERSION=2.8.7 +CMAKE_VERSION=2.8.10.2 check_version() { diff --git a/config_files/docutils.sh b/config_files/docutils.sh index 821cc0f..56c4b0f 100755 --- a/config_files/docutils.sh +++ b/config_files/docutils.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # docutils version # -DOCUTILS_VERSION=0.8.1 +DOCUTILS_VERSION=0.10 check_version(){ # It is not necessary to check version! @@ -25,8 +25,9 @@ return 0 print_env_bin(){ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG <& /dev/null && \ + sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.fip >& /dev/null +fi + +# [-] +local patch_gcc47_compat=1 +if [ "${patch_gcc47_compat}" = "1" ] ; then + echo -n ".. Patching freeimage sources: gcc 4.7 compatibility..." && \ + cd ${PRODUCT_SRC_DIR} && \ + sed -i 's%\(#include "OpenEXRConfig.h"\)%\1\n#include %g' Source/OpenEXR/IlmImf/ImfAutoArray.h >& /dev/null +fi + cd ${PRODUCT_SRC_DIR} ## building FreeImage library diff --git a/config_files/freetype.sh b/config_files/freetype.sh index 2bc2072..b579212 100755 --- a/config_files/freetype.sh +++ b/config_files/freetype.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # freetype version # -FREETYPE_VERSION=2.4.10 +FREETYPE_VERSION=2.4.11 check_version() { diff --git a/config_files/ftgl.sh b/config_files/ftgl.sh index e76b82a..c084bec 100755 --- a/config_files/ftgl.sh +++ b/config_files/ftgl.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # diff --git a/config_files/gl2ps.sh b/config_files/gl2ps.sh index 8f183ac..465535a 100755 --- a/config_files/gl2ps.sh +++ b/config_files/gl2ps.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # gl2ps version # -GL2PS_VERSION=1.3.5 +GL2PS_VERSION=1.3.8 check_version() { diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh index 85867a3..5aa0759 100755 --- a/config_files/graphviz.sh +++ b/config_files/graphviz.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,7 +15,7 @@ # # graphviz version # -GRAPHVIZ_VERSION=2.28.0 +GRAPHVIZ_VERSION=2.30.0 check_version() { @@ -38,6 +38,7 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < /dev/null && \ + sed -i "s%#include %#include \n#include %g" libsrc/include/mystdlib.h > /dev/null ) fi # to make nglib only: # -SUBDIRS = libsrc ng nglib tutorials doc windows # +SUBDIRS = libsrc nglib #ng tutorials doc windows -( cd ${PRODUCT_SRC_DIR} && sed -i "s/ng nglib/nglib #ng/g" Makefile.in ) +( cd ${PRODUCT_SRC_DIR} && sed -i "s/^\(SUBDIRS = .* \)ng /\1nglib #/g" Makefile.in ) # patch for gcc 4.3 ( cd ${PRODUCT_SRC_DIR} && sed -i "s%#include %#include \n#include %g" libsrc/include/mystdlib.h ) @@ -92,12 +94,11 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} cd ${PRODUCT_SRC_DIR} # configure -NETGEN_CONFIGURE_OPTIONS="--with-occ=${CASROOT} --prefix=${PRODUCT_DIR}" -NETGEN_CONFIGURE_OPTIONS="${NETGEN_CONFIGURE_OPTIONS} --with-tcl=${TCLHOME}/lib --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include" +NETGEN_CONFIGURE_OPTIONS="--with-occ=${CASROOT} --with-tcl=${TCLHOME}/lib --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include" if test `uname -m` = "x86_64" ; then - ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS='-O2 -m64' >> ${PRODUCT_DIR}/CONFIGURE.LOG + ./configure --prefix=${PRODUCT_DIR} ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS='-O2 -m64' >> ${PRODUCT_DIR}/CONFIGURE.LOG else - ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O0 >> ${PRODUCT_DIR}/CONFIGURE.LOG + ./configure --prefix=${PRODUCT_DIR} ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O0 >> ${PRODUCT_DIR}/CONFIGURE.LOG fi # compile @@ -194,7 +195,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="netgen-4.9.13" +export PRODUCT="netgen-${NETGEN_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/numpy.sh b/config_files/numpy.sh index 847cf21..b2340db 100755 --- a/config_files/numpy.sh +++ b/config_files/numpy.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -15,8 +15,8 @@ # # numpy and lapack versions # -NUMPY_VERSION=1.5.1 -LAPACK_VERSION=3.3 +NUMPY_VERSION=1.6.2 +LAPACK_VERSION=3.4.2 check_version(){ # It is not necessary to check version! @@ -26,9 +26,10 @@ return 0 print_env_bin(){ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < qscintilla.pro.new -mv -f qscintilla.pro.new qscintilla.pro +cd ${PRODUCT_SRC_DIR}/Qt4Qt5 + +local patch_build_procedure=1 +if [ "${patch_build_procedure}" = "1" ] ; then + # patch installation folder + sed -e "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g" \ + -e "s%\(header.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/include%g" \ + -e "s%\(trans.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/translations%g" \ + -e "s%\(qsci.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}%g" \ + qscintilla.pro > qscintilla.pro.new + mv -f qscintilla.pro.new qscintilla.pro +fi qmake -o Makefile qscintilla.pro check_job ${PRODUCT_DIR}/MAKE.LOG make diff --git a/config_files/qt.sh b/config_files/qt.sh index fb68cb5..e56a5c9 100755 --- a/config_files/qt.sh +++ b/config_files/qt.sh @@ -6,13 +6,13 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # #################################################################################### -QT_REF_VERSION="4.6.3" +QT_REF_VERSION="4.8.4" check_version(){ if [ -z "$QTDIR" ]; then @@ -30,6 +30,7 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <& /dev/null + if [ "$?" != "0" ] ; then + echo -n ".. Patching Qt sources: fix problem with gstreamer detection (WebKit)..." && \ + cd ${PRODUCT_SRC_DIR}/src/3rdparty/webkit/Source/WebCore && \ + sed -i "s%glib-2.0 gio-2.0 gstreamer-0.10%glib-2.0 gio-2.0 '\\\\'gstreamer-0.10 >= 0.10.28\\\\''%g" features.pri >& /dev/null + fi +fi + # to generate environment scripts try_preinstalled } @@ -88,9 +101,9 @@ EOF check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install -if test `uname -m` = "x86_64" ; then - ( cd ${PRODUCT_DIR} && ln -sf lib lib64 ) -fi +#if test `uname -m` = "x86_64" ; then +# ( cd ${PRODUCT_DIR} && ln -sf lib lib64 ) +#fi cd ${PRODUCT_DIR}; @@ -99,6 +112,14 @@ if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR} fi +# patch binaries +local patch_webkit_deps=1 +if [ "${patch_webkit_deps}" = "1" ] ; then + echo -n ".. Patching Qt binaries: fix wrong dependencies in libQtWebKit..." && \ + cd ${PRODUCT_DIR}/lib && \ + sed -i "s% -L../../WebCore/release%%g;s% -L../../JavaScriptCore/release%%g;s% -lwebcore%%g;s% -ljscore%%g" libQtWebKit.la >& /dev/null +fi + # to generate environment scripts try_preinstalled } diff --git a/config_files/qwt.sh b/config_files/qwt.sh index 308a383..f82675a 100755 --- a/config_files/qwt.sh +++ b/config_files/qwt.sh @@ -6,7 +6,7 @@ # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2012 CEA +# Copyright : 2002-2013 CEA # # This script is the part of the SALOME installation procedure. # @@ -40,6 +40,7 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh </dev/null`" ]; then @@ -32,6 +32,7 @@ print_env_bin() cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <> ${PRODUCT_DIR}/CONFIGURE.LOG <> ${PRODUCT_DIR}/MAKE.LOG <