Update build procedure of products for SALOME 7.

diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh
index bdb956ab0a62b6da63c13ea818a6142207d3b9a3..49f999a93d86e750a79372095bd3e9e938476581 100755 (executable)
--- 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 73ac34ac6793e13ae6dd9d99576c0f23ad29512e..5ddcde9933bceacec2ee95eaf79bc2d8f12a4d10 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export CAS_ROOT_DIR=\${CASROOT}
 export PATH=\${CASROOT}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${CASROOT}/lib:\${CASROOT}/lin/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
@@ -87,7 +88,10 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # apply 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 )
+local patch_sources=1
+if [ "${patch_sources}" = "1" ] ; then
+    ( test -f patches/${PRODUCT}.patch && cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < ${PRODUCT}.patch )
+fi
 
 # to generate environment scripts
 try_preinstalled
@@ -117,10 +121,10 @@ echo " +++++++++++ configure"
 flags=""
 
 # ... tcl/tk options
-tcldir="`where_tcl`"
-if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
-tkdir="`where_tk`"
-if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi
+if [ "${TCLHOME}" != "" ] ; then
+    flags="$flags --with-tcl=${TCLHOME}/lib"
+    flags="$flags --with-tk=${TCLHOME}/lib"
+fi
 # ... tbb options
 if [ "${TBBHOME}" != "" ] ; then
     flags="$flags --with-tbb-include=${TBBHOME}/include" 

diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh
index d98655ff622355a2c1b8c9dd1d24146497d746ef..9f64641c26fc9d45f2cbc4442aea50c70f7366a6 100755 (executable)
--- a/config_files/ParaView.sh
+++ b/config_files/ParaView.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 @@
 #
 # Paraview version and lib version
 #
-PVVERSION=3.14.0
+PVVERSION=3.98.1
 PVLIBVERSION=`echo ${PVVERSION} | awk -F. '{printf("%d.%d",$1,$2)}'`
 
 check_version()
@@ -35,6 +35,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PVHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PARAVIEW_ROOT_DIR=\${PVHOME}
 export PATH=\${PVHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${PVHOME}/lib/paraview-${PVLIBVERSION}:\${LD_LIBRARY_PATH}
 export PYTHONPATH=\${PVHOME}/lib/paraview-${PVLIBVERSION}:\${PVHOME}/lib/paraview-${PVLIBVERSION}/site-packages:\${PVHOME}/lib/paraview-${PVLIBVERSION}/site-packages/paraview:\${PYTHONPATH}
@@ -76,34 +77,39 @@ fi
 check_jb tar xfz ${data_archive} -C ${INST_ROOT}
 
 ### patch paraview
-# 1. patch for ParaViewLibraryDepends.cmake problem (ParaView 3.10.0) [OBSOLETE (fixed in 3.10.1)]
-need_patch_depend=0
-if [ "${need_patch_depend}" == "1" ] && [ -f patches/paraview-3.10.0-depend.patch ] ; then
-    cp patches/paraview-3.10.0-depend.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR} ; patch -p0 < paraview-3.10.0-depend.patch )
+# 1.
+local patch_lib_depends=1
+if [ "${patch_lib_depends}" == "1" ] ; then
+    echo -n ".. Patching ParaView sources: fix missing library dependencies..." && \
+       echo "target_link_libraries(vtkWrappingPython pthread util)" >> ${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 <<EOF
+IF (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+  FILE(GLOB files RELATIVE \${CMAKE_CURRENT_SOURCE_DIR} *.h)
+  INSTALL(
+        FILES \${files}
+        DESTINATION \${VTK_INSTALL_INCLUDE_DIR}
+        COMPONENT Development)
+ENDIF (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+EOF
 fi
 
 # to generate environment scripts
@@ -156,8 +162,8 @@ fi
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
 
 ### VTK general settings
+#CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_LEGACY_REMOVE:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
@@ -166,18 +172,23 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_64BIT_IDS:BOOL=OFF"
 ### Qt settings
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_QT_GUI:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_QT_USE_WEBKIT:BOOL=ON"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DQT_TESTING_INSTALL_DEVELOPMENT:BOOL=ON"
 
 ### Python settings
 if [ "${python_version}" != "" ]; then
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_USE_STATIC_LIBRARIES:BOOL=OFF"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONROOT}/bin/python${python_version}"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONROOT}/include/python${python_version}"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONROOT}/lib/python${python_version}/config/libpython${python_version}.a"
 fi
 
 ### Tcl/Tk settings
-if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
+#
+# TEMPORARILY DISABLE TCL WRAPPINGS DUE TO BUG IN PARAVIEW WRAPPER UTILITY!
+#
+if [ false ] && [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
@@ -187,13 +198,23 @@ if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${tcl_libs}/libtk${tcl_version}.so"
     #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${tcl_libs}/libtkstub${tcl_version}.a"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish${tcl_version}"
+else
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
 fi
 
 ### HDF5 settings
 if [ "${HDF5HOME}" != "" ]; then
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_HDF5:BOOL=ON"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_INCLUDE_DIR:STRING=${HDF5HOME}/include"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARY:STRING=${HDF5HOME}/lib/libhdf5.so"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ROOT:PATH=${HDF5HOME}"
+    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_INCLUDE_DIRS=${HDF5HOME}/include"
+    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARIES=${HDF5HOME}/lib/libhdf5.so;${HDF5HOME}/lib/libhdf5_hl.so"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_INCLUDE_DIR:PATH=${HDF5HOME}/include"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_HL_INCLUDE_DIR:PATH=${HDF5HOME}/include"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARY_DIRS=${HDF5HOME}/lib"
+    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_LIBRARY:PATH=${HDF5HOME}/lib/libhdf5.so"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_HL_LIBRARY_DIRS=${HDF5HOME}/lib"
+    #CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_HL_LIBRARY:PATH=${HDF5HOME}/lib/libhdf5_hl.so"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=OFF"
 fi
 
@@ -227,20 +248,6 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON"
 
-### Mesa settings (if pre-installed) [OBSOLETE]
-with_mesa=0
-if [ "${with_mesa}" == "1" ] && [ "$MESA_HOME" != "" ] ; then
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-  if test `uname -m` = "x86_64" ; then
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib64/libGL.so"
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib64/libGLU.so"
-  else
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
-      CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
-  fi
-  CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
-fi
-
 # configure
     
 cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
@@ -254,47 +261,36 @@ $CMAKE_OPTIONS
 EOF
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $CMAKE_OPTIONS
 
+# patch buildir
+local patch_fatal_warnings=1
+if [ "${patch_fatal_warnings}" == "1" ] ; then
+    echo -n ".. Patching ParaView builddir: fix problem with fatal warnings on linking..." && \
+       sed -i "s%-Wl,--fatal-warnings%%g" ${PRODUCT_BUILD_DIR}/VTK/Wrapping/Python/CMakeFiles/vtkpython.dir/link.txt
+fi
+
 # make
 
 cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=`which gcc`
 EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
+check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 VERBOSE=1
 
 # make install
-
-### `make install` has been replaced by `cpack` since Paraview 3.10.0
-use_make_install=0
-if [ "${use_make_install}" == "1" ] ; then
-    check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
    
-    ### Patch binaries
-    # - patch for missing libvtkPV*.so libraries (ParaView 3.10 development version) [OBSOLETE (fixed in 3.10.1)]
-    need_patch_libvtkpv=0
-    if [ "${need_patch_libvtkpv}" == "1" ] ; then
-       cd ${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}
-       for f in `find . -name "vtkPV*.so"` XXX ; do
-           if test "$f" == "XXX" ; then continue ; fi
-           d=`dirname $f`
-           f=`basename $f`
-           ( cd $d; if test ! -e lib$f ; then ln -sf $f lib$f ; fi;  ) 
-       done
-    fi
-else
-    check_job ${PRODUCT_DIR}/CPACK.LOG cpack -G TGZ --config Applications/ParaView/CPackParaView-DevelopmentConfig.cmake
-    bindir=`find ${PRODUCT_BUILD_DIR}/_CPack_Packages -type d -name "ParaView-*-${PVLIBVERSION}*"`
-    if [ "${bindir}" != "" ] ; then
-        cp -rf ${bindir}/* ${PRODUCT_DIR}
-    else
-       echo "Error on cpack step! CPack archive is not found! Exiting"
-    fi
-fi 
-
-### Patch binaries
-# - patch Paraview problem (bad VisItBridge configuration) [OBSOLETE (fixed in 3.10.1)]
-patch_visit_usage=0
-if [ "${patch_visit_usage}" == "1" ] ; then
-    sed -i "s%SET(PARAVIEW_USE_VISITBRIDGE \"ON\")%SET(PARAVIEW_USE_VISITBRIDGE \"OFF\")%g" ${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/ParaViewConfig.cmake
+# patch binaries
+local patch_vtkconfig=1
+if [ "${patch_vtkconfig}" == "1" ] ; then
+    echo -n ".. Patching ParaView binaries: fix problem with missing cmake modules..." && \
+       cp -f ${PRODUCT_BUILD_DIR}/VTK/VTKTargets.cmake ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION} && \
+       sed -i "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/lib/\([^/]\+\"\)%\1${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/\2%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /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 8954bf2051f25933de00332e10f7db7fceedf1d2..156194890c9ac60b1fbfa4c78b87523d197952bf 100755 (executable)
--- 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 <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYQTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PYQT_ROOT_DIR=\${PYQTDIR}
 export PYQT_SIPS=\${PYQTDIR}/sip
 export PATH=\${PYQTDIR}/bin:\$PATH
 export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/PyQt4:\${PYTHONPATH}
@@ -74,12 +75,19 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
-# apply patch for phonon package
-apply_patch_for_phonon=1
-if [ "$apply_patch_for_phonon" == "1" ] ; then
+# apply patch for phonon includes
+local patch_phonon_includes=1
+if [ "$patch_phonon_includes" == "1" ] ; then
     ( cd ${PRODUCT_SRC_DIR}/sip/phonon && for f in `find . -name "*.sip"` ; do sed -i "s%^#include <%#include <phonon/%g" $f ; done )
 fi
 
+# apply patch for phonon module
+local patch_phonon_module=1
+if [ "${patch_phonon_module}" = "1" ] ; then
+    echo -n ".. Patching PyQt sources: fix problem with improper phonon detection..." && \
+       sed -i "s%new Phonon::VideoWidget()%(new Phonon::VideoWidget())->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 d07929f9abb9f6dd13a25eb0435d45c5b8e7b9ff..79e9576305edd7a267bef1f47b7e2f08771da7b3 100755 (executable)
--- 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 <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PYTHONHOME=\$PYTHONROOT
+export PYTHON_ROOT_DIR=\${PYTHONROOT}
 export PATH=\${PYTHONROOT}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${PYTHONROOT}/lib:\${LD_LIBRARY_PATH}
 export PYTHON_VERSION=$PY_LIBVERSION
@@ -91,7 +92,7 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 cd ${PRODUCT_SRC_DIR}
 
 export PYTHON_ARCHIVE_PREFIX=""
-PYTHON_CONFIGURE_OPTIONS="--with-threads --with-cxx=`which g++` --enable-shared --without-test --with-libs=-lstdc++ --without-pymalloc"
+PYTHON_CONFIGURE_OPTIONS="--with-threads --enable-shared --with-libs=-lstdc++ --without-pymalloc"
 ### --with-pydebug ### (for debug)
 
 tcl_dir=`where_tcl`

diff --git a/config_files/Sphinx.sh b/config_files/Sphinx.sh
index ff8cd04ef28263acea7049e260df37a2e991358d..3f917430f208303d221d826fb2471b05658c59ad 100755 (executable)
--- a/config_files/Sphinx.sh
+++ b/config_files/Sphinx.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.
 #
@@ -28,8 +28,10 @@ return 0
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
+export SPHINX_ROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export SPHINX_ROOT_DIR=\${SPHINX_ROOT}
+export PYTHONPATH=\${SPHINX_ROOT}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PATH=\${SPHINX_ROOT}/bin:\${PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -85,14 +87,17 @@ export PATH=${PRODUCT_DIR}/bin:${PATH}
 
 export PYTHONDONTWRITEBYTECODE=
 
-# install omniORB
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
 EOF
+# install setuptools
 cd ${PRODUCT_SRC_DIR}/setuptools-${SETUPTOOLS_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+# install Pygments
 cd ${PRODUCT_SRC_DIR}/Pygments-${PYGMENTS_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+# install Jinja2
 cd ${PRODUCT_SRC_DIR}/Jinja2-${JINJA2_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
+# install Sphinx
 cd ${PRODUCT_SRC_DIR}/Sphinx-${SPHINX_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python ./setup.py install --prefix=${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin; 

diff --git a/config_files/boost.sh b/config_files/boost.sh
index ac9fab421d68dd3c35cb2a8759b98b7da9c0fda1..22c56572504d73899714bf18b735a9b5dcfc93d8 100755 (executable)
--- a/config_files/boost.sh
+++ b/config_files/boost.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 @@
 #
 # boost version
 #
-BOOST_VERSION=1.49.0
+BOOST_VERSION=1.52.0
 BOOST_XVERSION=`echo ${BOOST_VERSION} | awk -F. '{printf("%d",$1*100000+$2*100+$3)}'`
 BOOST_VVERSION=`echo ${BOOST_VERSION} | awk -F. '{printf("%d_%d",$1,$2)}'`
 
@@ -34,6 +34,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
 export BOOSTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export Boost_ROOT_DIR=\${BOOSTDIR}
 export LD_LIBRARY_PATH=\${BOOSTDIR}/lib:\${LD_LIBRARY_PATH}
 export PATH=\${BOOSTDIR}/include:\${PATH}
 ##
@@ -79,63 +80,19 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-# define python version
-python_root=`find_in_path python $PATH`;
-python_root=`cd ${python_root}/..; pwd`
-python_version=`python -c "import sys; print sys.version[:3]"`
-python_xversion=`echo $python_version | awk -F. '{print $1*100+$2}'`
-
-cd ${PRODUCT_SRC_DIR}/tools/build/v2/engine
-
-# add python version to the build.jam
-py_versions=`grep -E "for local v in ([0-9]\.[0-9])+" ./build.jam | sed -e"s%.*for local v in \(.*\)%\1%g"`
-echo $py_versions | grep $python_version >&/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 <<EOF
 used gcc=$GCC
 EOF
 
-cd ${PRODUCT_SRC_DIR}/tools/build/v2/engine
-check_job ${PRODUCT_DIR}/BUILD.LOG env BOOST_BUILD_PATH=$PRODUCT_SRC_DIR ./build.sh --debug --with-python=${python_root} --with-python-version=${python_version}
-
-# install
+# configure
 cd ${PRODUCT_SRC_DIR}
+check_job ${PRODUCT_DIR}/BUILD.LOG ./bootstrap.sh --with-toolset=gcc --with-python=`which python` --prefix=${PRODUCT_DIR}
 
-# patch for gcc 4.3
-sed -i 's%\(#.*include.*<limits>\)%\1\n#include <limits.h>%g' ./boost/limits.hpp
-sed -i 's%\(#.*include.*<string>\)%\1\n#include <string.h>%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 6f7aa5d5e90b68556e4447d10b9cf23548720237..01ef484875d9034430926cb723ca53c1eae59e93 100755 (executable)
--- 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 099f457b9d5be5e9c43070149a731a5414c814dc..d3ceb019a6b89e9f3b5c4d90d661cb018013a327 100755 (executable)
--- 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 821cc0f1e8bb58de753dd49d9ecbe731edf897bf..56c4b0fcb27fffb51c8fa0844b28f81771dbad50 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
+export DOCUTILS_ROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PYTHONPATH=\${DOCUTILS_ROOT}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PATH=\${DOCUTILS_ROOT}/bin:\${PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/doxygen.sh b/config_files/doxygen.sh
index e1159d98ace8bd291e7b17397712089aa5e6fe38..d13a4c5a6a49d524c9c213f378509e4099ab9a5c 100755 (executable)
--- a/config_files/doxygen.sh
+++ b/config_files/doxygen.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 @@
 #
 # Doxygen version
 #
-DOXYGEN_VERSION=1.8.0
+DOXYGEN_VERSION=1.8.3.1
 DOXYGEN_XVERSION=`echo ${DOXYGEN_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
 
 check_version()
@@ -39,7 +39,9 @@ print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
+export DOXYGEN_ROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export DOXYGEN_ROOT_DIR=\${DOXYGEN_ROOT}
+export PATH=\${DOXYGEN_ROOT}/bin:\${PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -72,10 +74,12 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
 # apply general patch for doxygen
-
-if [ -f patches/doxygen-${DOXYGEN_VERSION}.patch ] ; then
-    cp patches/doxygen-${DOXYGEN_VERSION}.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR}; patch -p1 < doxygen-${DOXYGEN_VERSION}.patch )
+local patch_sources=1
+if [ "${patch_sources}" = "1" ] ; then
+    if [ -f patches/doxygen-${DOXYGEN_VERSION}.patch ] ; then
+       cp patches/doxygen-${DOXYGEN_VERSION}.patch ${PRODUCT_SRC_DIR}
+       ( cd ${PRODUCT_SRC_DIR}; patch -p1 < doxygen-${DOXYGEN_VERSION}.patch )
+    fi
 fi
 
 # to generate environment scripts
@@ -91,9 +95,7 @@ install_source
 cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-f_install="--install "`which install`
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix ${PRODUCT_DIR} $f_install
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix ${PRODUCT_DIR}
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC

diff --git a/config_files/expat.sh b/config_files/expat.sh
index d9c81d21e5616ee1558646d691ab96ddbdbdf9e3..c661ae0741939d22e3f3a32b0a50a9817b765870 100755 (executable)
--- a/config_files/expat.sh
+++ b/config_files/expat.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/freeimage.sh b/config_files/freeimage.sh
index 675245e8a71ecac6305d120f74db5cf3e0da6447..117891edfb3e7ffcbc9bf5d55a01525b33376e2f 100755 (executable)
--- a/config_files/freeimage.sh
+++ b/config_files/freeimage.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 @@
 #
 # freeimage version
 #
-FREEIMAGE_VERSION=3.14.1
+FREEIMAGE_VERSION=3.15.4
 
 check_version()
 {
@@ -82,6 +82,24 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
+# patch sources
+# [-]
+local patch_build_procedure=1
+if [ "${patch_build_procedure}" = "1" ] ; then
+    echo -n ".. Patching freeimage sources: fix build procedure..." && \
+       cd ${PRODUCT_SRC_DIR} && \
+       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.gnu >& /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 <string.h>%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 2bc207225d767d416cc0f6788b1dc53b730f9e68..b5792125c888dd59ee617904f46e5808992a87f5 100755 (executable)
--- 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 e76b82ae6e0ef0f5d2f1c74f49d2f53596ae495e..c084becc4cc589c6291ab930e8ac5f37adfc3ad8 100755 (executable)
--- 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 8f183accba7f57b5a6fd434ca4206b6364931bc3..465535ab01e17e83053882b660fae4b009c580ae 100755 (executable)
--- 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 85867a38f5c81c2d2efbee5aa1f7ececfaf75176..5aa07598797bdf988851a324f98704928324106d 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GRAPHVIZHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export GRAPHVIZ_ROOT_DIR=\${GRAPHVIZHOME}
 export PATH=\${GRAPHVIZHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${GRAPHVIZHOME}/lib:\${GRAPHVIZHOME}/lib/graphviz:\${LD_LIBRARY_PATH}
 ##
@@ -94,6 +95,10 @@ fi
 if test `uname -m` == "x86_64" ; then
     CONFIGURE_FLAGS="${CONFIGURE_FLAGS} CFLAGS=-m64 CXXFLAGS=-m64"
 fi
+local without_cgraph=1
+if [ "${without_cgraph}" = "1" ] ; then
+    CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-cgraph=no"
+fi
 
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} ${CONFIGURE_FLAGS}
 

diff --git a/config_files/hdf5.sh b/config_files/hdf5.sh
index d17ea8035c58a62c38d771dc8f092d41e6779b35..8394c808dd0cb303dc25b1ccf52d4e86c9995a08 100755 (executable)
--- a/config_files/hdf5.sh
+++ b/config_files/hdf5.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 @@
 #
 # HDF5 version
 #
-HDF5_VERSION=1.8.8
+HDF5_VERSION=1.8.10
 #
 # Default API version for hdf5: 1.6
 #
@@ -45,6 +45,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export HDF5HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export HDF5_ROOT_DIR=\${HDF5HOME}
 export PATH=\${HDF5HOME}/bin:\$PATH
 export LD_LIBRARY_PATH=\${HDF5HOME}/lib:\${LD_LIBRARY_PATH}
 ##

diff --git a/config_files/homard.sh b/config_files/homard.sh
index bcaed0e585e5b86dda72ba0b43352b639e46d660..c56493535f3ef5ce07b5b07b50227edc38520627 100755 (executable)
--- a/config_files/homard.sh
+++ b/config_files/homard.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/libxml2.sh b/config_files/libxml2.sh
index a6274695958db18718b925e8c43aa6b8856a9770..5381d142e65c795691714419ee2b6951dea6392f 100755 (executable)
--- a/config_files/libxml2.sh
+++ b/config_files/libxml2.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 @@
 #
 # libxml version
 #
-LIBXML_VERSION=2.7.8
+LIBXML_VERSION=2.9.0
 
 check_version(){
 # No way to check version!
@@ -59,10 +59,13 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
-# patch problem with crash on 64bit platform; required at least for v2.7.8
-if [ -f patches/libxml2_2.7.8.patch ] ; then
-    cp patches/libxml2_2.7.8.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR}; patch < libxml2_2.7.8.patch )
+# patch sources
+local patch_sources=1
+if [ "${patch_sources}" = "1" ] ; then
+    if [ -f patches/${PRODUCT}.patch ] ; then
+       cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR}
+       ( cd ${PRODUCT_SRC_DIR}; patch < ${PRODUCT}.patch )
+    fi
 fi
 
 # to generate environment scripts

diff --git a/config_files/med.sh b/config_files/med.sh
index 5bff32221dae6611a994563b0e4a5337905ca5ed..45f3761f0e758dca0d133c06fa9ff20f3c636ebd 100755 (executable)
--- a/config_files/med.sh
+++ b/config_files/med.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.
 #
@@ -105,15 +105,6 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
-cd ${PRODUCT_DIR}/lib
-
-### patch badly created libmedimport.la
-### fixed in med 3.0.6
-need_patch_la=0
-if [ "${need_patch_la}" = "1" ] ; then
-    sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g" libmedimport.la
-fi
-
 cd ${PRODUCT_DIR};
 
 # remove sources and temporary files after building

diff --git a/config_files/metis.sh b/config_files/metis.sh
index 30a448c9f905c939917e66dc494e86807d89db4c..3873b81b12dbca7a3bb39803e570a566062ae637 100755 (executable)
--- a/config_files/metis.sh
+++ b/config_files/metis.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.
 #
@@ -87,8 +87,11 @@ else
     # for version 4
 
     # patch for 64bit platforms
-    if test `uname -m` = "x86_64" ; then
-        sed -i "s%COPTIONS[[:space:]]*=[[:space:]]*\(.*\)%COPTIONS = -fPIC \1%g" Makefile.in
+    local patch_64bits=1
+    if [ "${patch_64bits}" = "1" ] ; then
+       if test `uname -m` = "x86_64" ; then
+            sed -i "s%COPTIONS[[:space:]]*=[[:space:]]*\(.*\)%COPTIONS = -fPIC \1%g" Makefile.in
+       fi
     fi
 
     # make

diff --git a/config_files/netgen.sh b/config_files/netgen.sh
index b33aed0ab363be2fb1b595219de38e6227457edf..9e310ebbf43708b15a84da8544fa9049d844fb16 100755 (executable)
--- a/config_files/netgen.sh
+++ b/config_files/netgen.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 @@
 #
 # netgen version
 #
-NETGEN_VERSION=4.9.13
+NETGEN_VERSION=5.0.0
 
 check_version()
 {
@@ -66,13 +66,15 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 # apply general patch for SALOME
 if [ -f patches/netgen-${NETGEN_VERSION}-for-SALOME.patch ] ; then
     cp patches/netgen-${NETGEN_VERSION}-for-SALOME.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR}; patch -p1 < netgen-${NETGEN_VERSION}-for-SALOME.patch )
+    ( cd ${PRODUCT_SRC_DIR}; patch -p1 < netgen-${NETGEN_VERSION}-for-SALOME.patch && \
+       sed -i "s/^\(SUBDIRS = .* \)ng /\1nglib #/g" Makefile.in > /dev/null && \
+       sed -i "s%#include <string>%#include <string>\n#include <string.h>%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 <string>%#include <string>\n#include <string.h>%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 847cf217e4828997b0b849138deaa6794db359eb..b2340dbbf274d8d3814be0efb30df48396498d89 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}/lib:\${LD_LIBRARY_PATH}
+export NUMPY_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PYTHONPATH=\${NUMPY_DIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PATH=\${NUMPY_DIR}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${NUMPY_DIR}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -75,12 +76,10 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-export LD_LIBRARY_PATH=${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/lib:${LD_LIBRARY_PATH}
-
 # lapack cmake options
-CMAKE_OPTIONS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC -DBUILD_SHARED_LIBS:BOOL=ON"
+CMAKE_OPTIONS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR} -DBUILD_SHARED_LIBS:BOOL=ON"
 
-# install
+# install lapack
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -89,14 +88,10 @@ cd ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake . ${CMAKE_OPTIONS}
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-cd ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/TESTING/MATGEN ; cp -rf *.so ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/lib
-cd ${PRODUCT_SRC_DIR}/numpy-${NUMPY_VERSION}_SRC ; check_job ${PRODUCT_DIR}/MAKE.LOG python setup.py install --prefix=${PRODUCT_DIR}
-
-cd ${PRODUCT_SRC_DIR}/lapack-${LAPACK_VERSION}_SRC/lib
-list=`ls *.so`
-for aLib in $list; do
-    cp -rf ${aLib} ${PRODUCT_DIR}/lib
-done
+
+# install numpy
+cd ${PRODUCT_SRC_DIR}/numpy-${NUMPY_VERSION}_SRC
+check_job ${PRODUCT_DIR}/MAKE.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}
 

diff --git a/config_files/omniORB.sh b/config_files/omniORB.sh
index 8d00975160e2c59179546ce32173e2d56bcd9cb6..9ad8b2773dadc6fe8beac3112d839e1696b62965 100755 (executable)
--- a/config_files/omniORB.sh
+++ b/config_files/omniORB.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.
 #
@@ -67,6 +67,7 @@ fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export OMNIORBDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export OMNIORB_DIR=\${OMNIORBDIR}
 export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 export PATH=\$OMNIORBDIR/bin:\$PATH
 export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
@@ -109,16 +110,23 @@ check_jb tar xfz ${SOURCE_DIR}/omniORB-${OMNIORB_VERSION}.tar.gz -C ${PRODUCT_SR
 check_jb tar xfz ${SOURCE_DIR}/omniORBpy-${OMNIORBPY_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
 check_jb tar xfz ${SOURCE_DIR}/omniNotify-${OMNINOTIFY_VERSION}.tar.gz -C ${PRODUCT_SRC_DIR}
 
-if [ -f patches/omniNotify-${OMNINOTIFY_VERSION}.patch ] ; then
-    cp patches/omniNotify-${OMNINOTIFY_VERSION}.patch ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC
-    ( cd ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC ; patch -p1 < omniNotify-${OMNINOTIFY_VERSION}.patch )
+local patch_omninotify=1
+if [ "${patch_omninotify}" = "1" ] ; then
+    if [ -f patches/omniNotify-${OMNINOTIFY_VERSION}.patch ] ; then
+       cp patches/omniNotify-${OMNINOTIFY_VERSION}.patch ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC
+       ( cd ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC ; patch -p1 < omniNotify-${OMNINOTIFY_VERSION}.patch )
+    fi
 fi
-if test `uname -m` = "x86_64" ; then
-    if [ -f patches/omniNotify-${OMNINOTIFY_VERSION}-lib64.patch ] ; then
-        cp patches/omniNotify-${OMNINOTIFY_VERSION}-lib64.patch ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC
-        ( cd ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC ; patch -p1 < omniNotify-${OMNINOTIFY_VERSION}-lib64.patch )
+local patch_64bits=1
+if [ "${patch_64bits}" = "1" ] ; then
+    if test `uname -m` = "x86_64" ; then
+       if [ -f patches/omniNotify-${OMNINOTIFY_VERSION}-lib64.patch ] ; then
+            cp patches/omniNotify-${OMNINOTIFY_VERSION}-lib64.patch ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC
+            ( cd ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC ; patch -p1 < omniNotify-${OMNINOTIFY_VERSION}-lib64.patch )
+       fi
     fi
 fi
+
 # to generate environment scripts
 try_preinstalled
 }
@@ -158,6 +166,15 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG make
 check_job ${PRODUCT_DIR}/INSTALL_OMNIORBPY.LOG make install
 
+# patch omniORBpy binaries
+local patch_pyfiles=1
+if [ "${patch_pyfiles}" = "1" ] ; then
+    cd ${PRODUCT_DIR}/bin
+    for l in omniidl omniidlrun.py ; do
+       sed -i "s%#\!.*python%#\!/usr/bin/env python%;s%\"[^[:space:]]*${PRODUCT}\([^[:space:]]*\)\"%\"${PRODUCT_DIR}\1\"%" ${l}
+    done
+fi
+
 # install omniNotify
 cd ${PRODUCT_SRC_DIR}/omniNotify-${OMNINOTIFY_VERSION}_SRC
 
@@ -173,11 +190,6 @@ EOF
 check_job ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG make
 check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install
 
-cd ${PRODUCT_DIR}/bin
-for l in omniidl omniidlrun.py ; do
-    sed -i "s%#\!.*python%#\!/usr/bin/env python%;s%\"[^[:space:]]*${PRODUCT}\([^[:space:]]*\)\"%\"${PRODUCT_DIR}\1\"%" ${l}
-done
-
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}

diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index e4241d913b64b4838a2fea2feff9b4ed5809ea4b..bcf7cc6ca74ef01647bd5aaccc4743d5da92a956 100755 (executable)
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.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 @@
 #
 # QSCINTILLA  version
 #
-QSCINTILLA_VERSION=2.6.1
+QSCINTILLA_VERSION=2.7.0
 
 check_version(){
 if [ -z "${QSCINTILLA_DIR}" ]; then
@@ -85,15 +85,18 @@ cd ${PRODUCT_SRC_DIR}
 INSTALL_ROOT_PREV=$INSTALL_ROOT
 unset INSTALL_ROOT
 
-cd ${PRODUCT_SRC_DIR}/Qt4
-
-# 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
+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 fb68cb5956ebf88e456abf46c3638be5f976a5b0..e56a5c9bc5c9c4afc9d9cdd80cc321f578b96553 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export QTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export QT_ROOT_DIR=\${QTDIR}
 export PATH=\${QTDIR}/bin:\$PATH 
 export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
 export QT_PLUGIN_PATH=\${QTDIR}/plugins
@@ -63,6 +64,18 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
+# patch sources
+local patch_for_gstreamer=1
+if [ "${patch_for_gstreamer}" = "1" ] ; then
+    # check that we need a patch for problem with gstreamer (note that it does not always help!)
+    pkg-config --libs gstreamer-app-0.10 >& /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 308a383822a1366ac4115effabdf7013e9ddd4c7..f82675a56a06bca240efb6a27ef1f386e1318158 100755 (executable)
--- 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 <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export QWTHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export QWT_ROOT_DIR=\${QWTHOME}
 export LD_LIBRARY_PATH=\${QWTHOME}/lib:\${LD_LIBRARY_PATH} 
 ##
 EOF
@@ -84,20 +85,23 @@ install_source
 cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-# specify install path
-if [ "${QWT_MAJOR_VERSION}" == "5" ] ; then
-    # for Qwt 5.x the variable is INSTALLBASE
-    sed -i "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" qwtconfig.pri
-else
-    # for Qwt 6.x the variable is QWT_INSTALL_PREFIX
-    sed -i "s%\(QWT_INSTALL_PREFIX[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" qwtconfig.pri
-fi
-
-if [ "${QWT_MAJOR_VERSION}" == "5" ] ; then
-    # include QwtSvg support (required only for qwt 5.x)
-    sed -i "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri
-    # specify correct installation path for the designer plugin (required only for qwt 5.x)
-    sed -i "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" designer/designer.pro
+local patch_build_procedure=1
+if [ "${patch_build_procedure}" = "1" ] ; then
+    # specify install path
+    if [ "${QWT_MAJOR_VERSION}" == "5" ] ; then
+        # for Qwt 5.x the variable is INSTALLBASE
+       sed -i "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" qwtconfig.pri
+    else
+        # for Qwt 6.x the variable is QWT_INSTALL_PREFIX
+       sed -i "s%\(QWT_INSTALL_PREFIX[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" qwtconfig.pri
+    fi
+    
+    if [ "${QWT_MAJOR_VERSION}" == "5" ] ; then
+        # include QwtSvg support (required only for qwt 5.x)
+       sed -i "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri
+        # specify correct installation path for the designer plugin (required only for qwt 5.x)
+       sed -i "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" designer/designer.pro
+    fi
 fi
 
 INSTALL_ROOT_PREV=$INSTALL_ROOT

diff --git a/config_files/scotch.sh b/config_files/scotch.sh
index f83a781e28459851c8680b7672661892a6a379b3..bad3e03cfcea6eda39c1141d148e52c1ba244020 100755 (executable)
--- a/config_files/scotch.sh
+++ b/config_files/scotch.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.
 #
@@ -81,6 +81,13 @@ else
     ln -sf Make.inc/Makefile.inc.i686_pc_linux2.prof Makefile.inc
 fi
 
+local patch_pthread=1
+if [ "${patch_pthread}" = "1" ] ; then
+    echo -n ".. Patching scotch sources: fix pb with linking to pthread..." && \
+       cd ${PRODUCT_SRC_DIR}/src && \
+       sed -i "s%^\(LDFLAGS.*\)%\1 -lpthread%g" Makefile.inc
+fi
+
 # make
 check_job ${PRODUCT_DIR}/MAKE.LOG make prefix=${PRODUCT_DIR}
 

diff --git a/config_files/sip.sh b/config_files/sip.sh
index 9e79651497d11a7cdc3ec0053fa167495f8132d2..169c0dde9b20b10e2139d74f42333bcd33be6408 100755 (executable)
--- a/config_files/sip.sh
+++ b/config_files/sip.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 @@
 #
 # sip version
 #
-SIP_VERSION=4.13.2
+SIP_VERSION=4.14.2
 SIP_XVERSION=`echo ${SIP_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
 
 check_version()
@@ -38,6 +38,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SIPDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export SIP_ROOT_DIR=\${SIPDIR}
 export PATH=\${SIPDIR}/bin:\${PATH}
 export PYTHONPATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 export LD_LIBRARY_PATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${LD_LIBRARY_PATH}

diff --git a/config_files/swig.sh b/config_files/swig.sh
index 1bac099c008aa135387abbf8b04954550bc95332..673fccaefba125bb4a6f3f2b193a7585eb276607 100755 (executable)
--- a/config_files/swig.sh
+++ b/config_files/swig.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 @@
 #
 # swig version
 #
-SWIG_VERSION=1.3.40
+SWIG_VERSION=2.0.9
 
 check_version(){
 if [ -n "`which swig 2>/dev/null`" ]; then
@@ -32,6 +32,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM 
 export SWIG_ROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export SWIG_ROOT_DIR=\${SWIG_ROOT}
 export PATH=\${SWIG_ROOT}/bin:\${PATH}
 export SWIG_LIB=\${SWIG_ROOT}/share/swig/${SWIG_VERSION}
 ##
@@ -74,15 +75,14 @@ install_source_and_build()
 install_source
 
 # build sources
+cd ${PRODUCT_SRC_DIR}
+SWIG_CONFIGURE_FLAGS="--with-boost=${BOOSTDIR} --with-python=${PYTHONHOME} --with-tcl=${TCLHOME}"
 if test `uname -m` = "x86_64" ; then
-export CFLAGS=-m64 
-export CXXFLAGS=-m64
+    SWIG_CONFIGURE_FLAGS="${SWIG_CONFIGURE_FLAGS} CFLAGS=-m64 CXXFLAGS=-m64"
 fi
-
-cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} 
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} ${SWIG_CONFIGURE_FLAGS}
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC

diff --git a/config_files/tbb30_018oss.sh b/config_files/tbb30_018oss.sh
index 10e7d6eec1a204761ae1b23ec6e5af48730a78a4..19be85c1664f78676c2dc44dc3ee04317e9bb75c 100755 (executable)
--- a/config_files/tbb30_018oss.sh
+++ b/config_files/tbb30_018oss.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/tcltk.sh b/config_files/tcltk.sh
index d283e3da6831acfc9ac63edf88bc0816d873368f..dcff6f9ac0a4312b9d93d628a56c7d2a8bcd9ee4 100755 (executable)
--- a/config_files/tcltk.sh
+++ b/config_files/tcltk.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,9 +15,9 @@
 #
 # tcl, tk and tclX versions
 #
-TCL_VERSION=8.5.8
-TK_VERSION=8.5.8
-TCLX_VERSION=8.4.0
+TCL_VERSION=8.6.0
+TK_VERSION=8.6.0
+TCLX_VERSION=8.4.1
 #
 TCL_LIBVERSION=`echo $TCL_VERSION | awk -F. '{printf("%d.%d", $1, $2)}'`
 TK_LIBVERSION=`echo $TK_VERSION | awk -F. '{printf("%d.%d", $1, $2)}'`
@@ -121,7 +121,12 @@ cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 Configuring tcl...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads --prefix=${PRODUCT_DIR}
+local TCL_CONFIGURE_FLAGS="--enable-gcc --enable-shared --enable-threads"
+if test `uname -m` = "x86_64" ; then
+    TCL_CONFIGURE_FLAGS="${TCL_CONFIGURE_FLAGS} --enable-64bit"
+fi
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure \
+    --prefix=${PRODUCT_DIR} ${TCL_CONFIGURE_FLAGS}
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -147,7 +152,11 @@ cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 Configuring tk...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads --prefix=${PRODUCT_DIR} --with-tcl=${PRODUCT_DIR}/lib
+local TK_CONFIGURE_FLAGS="--enable-gcc --enable-shared --enable-threads --with-tcl=${PRODUCT_DIR}/lib"
+if test `uname -m` = "x86_64" ; then
+    TK_CONFIGURE_FLAGS="${TK_CONFIGURE_FLAGS} --enable-64bit"
+fi
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${TK_CONFIGURE_FLAGS} --prefix=${PRODUCT_DIR}
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 -------------------
 Making tk...
@@ -165,17 +174,21 @@ check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 (cd ${PRODUCT_DIR}/lib; ln -fs libtk${TK_LIBVERSION}.so libtk.so)
 (cd ${PRODUCT_DIR}/lib; ln -fs libtkstub${TK_LIBVERSION}.a libtkstub.a)
 
-cd ${PRODUCT_SRC_DIR}/tclx-${TCLX_VERSION}_SRC
-#INV - bug in a tclx configure 
-chmod +w configure && sed -i "s/relid'/relid/" configure
+#cd ${PRODUCT_SRC_DIR}/tclx-${TCLX_VERSION}_SRC
+##INV - bug in a tclx configure 
+#chmod +w configure && sed -i "s/relid'/relid/" configure
 
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------
 Configuring tclx...
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --enable-gcc --enable-shared --enable-threads \
-    --prefix=${PRODUCT_DIR} --with-tcl=${PRODUCT_DIR}/lib --with-tk=${PRODUCT_DIR}/lib
+local TCLX_CONFIGURE_FLAGS="--enable-gcc --enable-shared --enable-threads --with-tcl=${PRODUCT_DIR}/lib --with-tk=${PRODUCT_DIR}/lib"
+if test `uname -m` = "x86_64" ; then
+    TCLX_CONFIGURE_FLAGS="${TCLX_CONFIGURE_FLAGS} --enable-64bit"
+fi
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure \
+    --prefix=${PRODUCT_DIR} ${TCLX_CONFIGURE_FLAGS}
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 -------------------
 Making tclx...
@@ -191,8 +204,8 @@ check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
 (cd ${PRODUCT_DIR}/lib; ln -fs tclx${TCLX_LIBVERSION}/libtclx${TCLX_LIBVERSION}.so libtclx.so)
 
-cd ${PRODUCT_DIR}
-test `uname -m` = "x86_64" && test ! -e lib64 && ln -s lib lib64
+#cd ${PRODUCT_DIR}
+#test `uname -m` = "x86_64" && test ! -e lib64 && ln -s lib lib64
 
 # remove sources and temporary files after building
 if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then