From 9f627fff65842d5a6a4097efb8ed8cccb5146fb9 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 25 Nov 2014 15:16:16 +0300 Subject: [PATCH] Migrate to new products: - ParaView 4.2.0 - OCCT 6.8.0 - med 3.0.8 - libBatch 2.2.0 - numpy 1.8.1 - lapack 3.5.0 - graphviz 2.38.0 - MeshGems 1.3-8 --- config_CentOS_5.5_64bit.xml | 14 ++++---- config_CentOS_6.3_64bit.xml | 14 ++++---- config_Debian_6.0_64bit.xml | 14 ++++---- config_Debian_7_64bit.xml | 14 ++++---- config_Fedora_18_64bit.xml | 14 ++++---- config_Mandriva_2010.0_64bit.xml | 14 ++++---- config_Ubuntu_13.10_64bit.xml | 14 ++++---- config_files/DISTENE.sh | 2 +- config_files/OCCT.sh | 2 +- config_files/ParaView.sh | 58 +++++++++++++++++++------------- config_files/graphviz.sh | 10 +++--- config_files/libBatch.sh | 2 +- config_files/med.sh | 3 +- config_files/numpy.sh | 8 ++--- 14 files changed, 98 insertions(+), 85 deletions(-) diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 0287ebd..c49d268 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -512,7 +512,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -557,7 +557,7 @@ type="prerequisite" description="MED format interface library"> @@ -584,7 +584,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -593,7 +593,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -602,7 +602,7 @@ type="prerequisite" description="Generic batch management library"> @@ -620,7 +620,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -665,7 +665,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_CentOS_6.3_64bit.xml b/config_CentOS_6.3_64bit.xml index 9419ae9..a4ec110 100755 --- a/config_CentOS_6.3_64bit.xml +++ b/config_CentOS_6.3_64bit.xml @@ -503,7 +503,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -548,7 +548,7 @@ type="prerequisite" description="MED format interface library"> @@ -575,7 +575,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -584,7 +584,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -593,7 +593,7 @@ type="prerequisite" description="Generic batch management library"> @@ -611,7 +611,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -656,7 +656,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index 5d46998..d511dc2 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -503,7 +503,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -548,7 +548,7 @@ type="prerequisite" description="MED format interface library"> @@ -575,7 +575,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -584,7 +584,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -593,7 +593,7 @@ type="prerequisite" description="Generic batch management library"> @@ -611,7 +611,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -656,7 +656,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_Debian_7_64bit.xml b/config_Debian_7_64bit.xml index 3d150bf..17fe620 100644 --- a/config_Debian_7_64bit.xml +++ b/config_Debian_7_64bit.xml @@ -503,7 +503,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -548,7 +548,7 @@ type="prerequisite" description="MED format interface library"> @@ -575,7 +575,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -584,7 +584,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -593,7 +593,7 @@ type="prerequisite" description="Generic batch management library"> @@ -611,7 +611,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -656,7 +656,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_Fedora_18_64bit.xml b/config_Fedora_18_64bit.xml index 691832b..67eddd7 100755 --- a/config_Fedora_18_64bit.xml +++ b/config_Fedora_18_64bit.xml @@ -503,7 +503,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -548,7 +548,7 @@ type="prerequisite" description="MED format interface library"> @@ -575,7 +575,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -584,7 +584,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -593,7 +593,7 @@ type="prerequisite" description="Generic batch management library"> @@ -611,7 +611,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -656,7 +656,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 362308a..93732d7 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -503,7 +503,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -548,7 +548,7 @@ type="prerequisite" description="MED format interface library"> @@ -575,7 +575,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -584,7 +584,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -593,7 +593,7 @@ type="prerequisite" description="Generic batch management library"> @@ -611,7 +611,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -656,7 +656,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_Ubuntu_13.10_64bit.xml b/config_Ubuntu_13.10_64bit.xml index 0962062..c2b2739 100644 --- a/config_Ubuntu_13.10_64bit.xml +++ b/config_Ubuntu_13.10_64bit.xml @@ -503,7 +503,7 @@ type="prerequisite" description="Open CASCADE Technology"> @@ -548,7 +548,7 @@ type="prerequisite" description="MED format interface library"> @@ -575,7 +575,7 @@ type="prerequisite" description="Scalable, open-source visualization application"> @@ -584,7 +584,7 @@ type="prerequisite" description="Fundamental package for scientific computing with Python"> @@ -593,7 +593,7 @@ type="prerequisite" description="Generic batch management library"> @@ -611,7 +611,7 @@ type="prerequisite" description="Graph Drawing Programs set"> @@ -656,7 +656,7 @@ type="prerequisite" description="DISTENE meshing tools"> diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh index bfe5d48..f52680b 100755 --- a/config_files/DISTENE.sh +++ b/config_files/DISTENE.sh @@ -15,7 +15,7 @@ # # MeshGems version # -VERSION_MESHGEMS=1.1 +VERSION_MESHGEMS=1.3 # Platform suffuix if test `uname -m` = "x86_64" ; then diff --git a/config_files/OCCT.sh b/config_files/OCCT.sh index f8e8af4..292f389 100755 --- a/config_files/OCCT.sh +++ b/config_files/OCCT.sh @@ -15,7 +15,7 @@ # # Open CASCADE Technology version # -VERSION_OCCT=6.7.1 +VERSION_OCCT=6.8.0 check_version() { diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh index 2d9710e..2852f55 100755 --- a/config_files/ParaView.sh +++ b/config_files/ParaView.sh @@ -15,7 +15,7 @@ # # Paraview version and lib version # -VERSION_PARAVIEW=4.1.0 +VERSION_PARAVIEW=4.2.0 PVLIBVERSION=`echo ${VERSION_PARAVIEW} | awk -F. '{printf("%d.%d",$1,$2)}'` check_version() @@ -78,16 +78,16 @@ if [ -f ${data_archive} ] ; then fi ### patch options -local patch_sources=1 -local patch_lib_depends=0 # not needed when dynamic Python libs are used -local patch_dlopen=1 -local patch_surface_lic=1 -local patch_topological_sort=1 -local patch_matplotlib=0 # included to diff patch -local patch_missing_headers=1 -local patch_python_threads=0 # included to diff patch -local patch_vtk_math=0 # not needed for pv4.1 -local patch_kwprocess=1 +local patch_sources=1 # apply source patch : - +local patch_lib_depends=0 # fix pb with missing lib dependencies : not needed when dynamic Python libs are used +local patch_dlopen=1 # fix for crash on dlclose() : - +local patch_surface_lic=1 # fix hangup on generation of docs in SurfaceLIC plugin : - +local patch_topological_sort=0 # fix for missing topological sort : not needed since pv4.2 +local patch_matplotlib=0 # fix for pb crash on initialization of matplotlib : included to diff patch +local patch_missing_headers=0 # fix for missing dev headers : not needed since pv4.2 +local patch_python_threads=0 # fix for paraview multi-thread support : included to diff patch +local patch_vtk_math=0 # fix for vtkMath header : not needed since pv4.1 +local patch_kwprocess=0 # fix for hangup in kwProcess : not needed since pv4.2 # patch: apply general sources patch if present if [ "${patch_sources}" = "1" ] ; then @@ -115,6 +115,7 @@ if [ "${patch_topological_sort}" = "1" ] ; then sed -i "s%CMake/vtkWrapTcl.cmake%CMake/vtkWrapTcl.cmake\n\t\tCMake/TopologicalSort.cmake%" ${PRODUCT_SRC_DIR}/VTK/CMake/vtkModuleTop.cmake fi +# patch: fix pb about initializing matplotlib if [ "${patch_matplotlib}" = "1" ] ; then sed -i "s%^[[:space:]]*vtkMatplotlibMathTextUtilities::NOT_TESTED;%vtkMatplotlibMathTextUtilities::UNAVAILABLE;%" ${PRODUCT_SRC_DIR}/VTK/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx fi @@ -165,9 +166,9 @@ mkdir ${PRODUCT_BUILD_DIR} cd ${PRODUCT_BUILD_DIR} # patch options -local patch_fatal_warnings=0 # not needed for pv4.1 -local patch_vtkconfig=1 -local patch_nvidia_deps=1 +local patch_fatal_warnings=0 # fix for fatal warnings : not needed since pv4.1 +local patch_vtkconfig=1 # fix for wrong installed config files : - +local patch_nvidia_deps=1 # fix for wrong deps on NVidia drivers : - # get Python and tcl/tk version python_version="`python -c 'import sys; print sys.version[:3]'`" @@ -184,6 +185,9 @@ fi CMAKE_OPTIONS="" +# source dir +CMAKE_OPTIONS="${CMAKE_OPTIONS} ${PRODUCT_SRC_DIR}" + ### common settings CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Release" @@ -227,7 +231,7 @@ if [ "${python_version}" != "" ]; then CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/python${python_version}" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${python_version}" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPYTHON_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/python${python_version}/config/libpython${python_version}.so" - #CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_NO_PYTHON_THREADS:BOOL=OFF" + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_NO_PYTHON_THREADS:BOOL=OFF" fi ### Tcl/Tk settings @@ -297,7 +301,10 @@ if [ "${LIBXML2_ROOT_DIR}" != "" ]; then fi ### freetype settings -CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON" +if [ "${FREETYPE_ROOT_DIR}" != "" ]; then + export FREETYPE_DIR=${FREETYPE_ROOT_DIR} + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON" +fi ### Extra options (switch off non-used Paraview plug-ins) CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF" @@ -329,7 +336,7 @@ tclsh : `which tclsh` qmake : `which qmake` Used options: ${CMAKE_OPTIONS} EOF -check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} ${CMAKE_OPTIONS} +check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${CMAKE_OPTIONS} # patch: fix problems with fatal warnings if [ "${patch_fatal_warnings}" = "1" ] ; then @@ -345,7 +352,7 @@ check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make VERBOSE=1 install # patch: modify config files properly if [ "${patch_vtkconfig}" = "1" ] ; then - cp -f ${PRODUCT_BUILD_DIR}/VTK/VTKTargets.cmake ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION} + #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 sed -i "s%\(IMPORTED_LOCATION_RELEASE.*\"\).*/bin/\([^/]\+\"\)%\1${PRODUCT_DIR}/bin/\2%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake sed -i "s%\(IMPORTED_LOCATION_DEBUG.*\"\).*/lib/\([^/]\+\"\)%\1${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/\2%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake @@ -358,12 +365,17 @@ fi # patch: fix wrong NVidia drivers dependencies if [ "${patch_nvidia_deps}" = "1" ] ; then - pvtargetsfile=ParaViewTargets-release.cmake + local pvtargetsfile=ParaViewTargets-release.cmake + local vtktargetsfile=VTKTargets-release.cmake #pvtargetsfile=ParaViewTargets-debug.cmake - - ( test -f ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake || true ) - ( test -f ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/${pvtargetsfile} && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/${pvtargetsfile} || true ) - ( test -f ${PRODUCT_DIR}/lib/CMake/${pvtargetsfile} && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/CMake/${pvtargetsfile} || true ) + #vtktargetsfile=VTKTargets-debug.cmake + + ( test -f ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewTargets.cmake && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/ParaViewTargets.cmake >& /dev/null || true ) && \ + ( test -f ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/${pvtargetsfile} && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/${pvtargetsfile} >& /dev/null || true ) && \ + ( test -f ${PRODUCT_DIR}/lib/CMake/${pvtargetsfile} && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/CMake/${pvtargetsfile} >& /dev/null || true ) && \ + ( test -f ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/VTKTargets.cmake >& /dev/null || true ) && \ + ( test -f ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/${vtktargetsfile} && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/cmake/paraview-${PVLIBVERSION}/${vtktargetsfile} >& /dev/null || true ) && \ + ( test -f ${PRODUCT_DIR}/lib/CMake/${vtktargetsfile} && sed -i "s%/usr/lib/libXNVCtrl.a;%%g" ${PRODUCT_DIR}/lib/CMake/${vtktargetsfile} >& /dev/null || true ) fi cd ${PRODUCT_DIR} diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh index 6218392..fde4040 100755 --- a/config_files/graphviz.sh +++ b/config_files/graphviz.sh @@ -15,7 +15,7 @@ # # graphviz version # -VERSION_GRAPHVIZ=2.30.0 +VERSION_GRAPHVIZ=2.38.0 GRAPHVIZ_XVERSION=`echo ${VERSION_GRAPHVIZ} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` check_version() @@ -99,10 +99,10 @@ CONFIGURE_FLAGS="--prefix=${PRODUCT_DIR} --disable-rpath --disable-tcl --without 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 +#local without_cgraph=1 +#if [ "${without_cgraph}" = "1" ] ; then +# CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-cgraph=no" +#fi cat > ${PRODUCT_DIR}/CONFIGURE.LOG < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${PRODUCT_DIR}/CONFIGURE_LAPACK.LOG <