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

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 0287ebdf76b348bd12ead85bfc32de403d0b38ec..c49d268a873b62ba1ef645d7acf60af8ed5206e4 100755 (executable)
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -512,7 +512,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="CentOS 5.5 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -557,7 +557,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="CentOS 5.5 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="CentOS 5.5 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="CentOS 5.5 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -602,7 +602,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="CentOS 5.5 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -620,7 +620,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="CentOS 5.5 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -665,7 +665,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="CentOS 5.5 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_CentOS_6.3_64bit.xml b/config_CentOS_6.3_64bit.xml
index 9419ae9f2d0d013b6737b83776e4d9f110514322..a4ec11062c1d4bf53822a42c4dac7664c7a299a9 100755 (executable)
--- a/config_CentOS_6.3_64bit.xml
+++ b/config_CentOS_6.3_64bit.xml
@@ -503,7 +503,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="CentOS 6.3 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -548,7 +548,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="CentOS 6.3 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -575,7 +575,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="CentOS 6.3 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="CentOS 6.3 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="CentOS 6.3 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -611,7 +611,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="CentOS 6.3 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -656,7 +656,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="CentOS 6.3 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 5d46998030522816ee868dafd7fb0c39161fe12e..d511dc28fd083a5b9abb12a16a1cf347b81651bb 100755 (executable)
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -503,7 +503,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="Debian 6.0 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -548,7 +548,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="Debian 6.0 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -575,7 +575,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="Debian 6.0 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="Debian 6.0 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 6.0 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -611,7 +611,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="Debian 6.0 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -656,7 +656,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="Debian 6.0 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_Debian_7_64bit.xml b/config_Debian_7_64bit.xml
index 3d150bf8db026f0a9803d1ff788dc0e76da767a1..17fe620fa040819c87575c9576353a581b71d1f4 100644 (file)
--- a/config_Debian_7_64bit.xml
+++ b/config_Debian_7_64bit.xml
@@ -503,7 +503,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="Debian 7 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -548,7 +548,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="Debian 7 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -575,7 +575,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="Debian 7 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="Debian 7 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="Debian 7 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -611,7 +611,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="Debian 7 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -656,7 +656,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="Debian 7 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_Fedora_18_64bit.xml b/config_Fedora_18_64bit.xml
index 691832bd20ff053580338a67b06ec3c81ad216ec..67eddd7d18d7dbcfbf37cd77dd73917642be5a96 100755 (executable)
--- a/config_Fedora_18_64bit.xml
+++ b/config_Fedora_18_64bit.xml
@@ -503,7 +503,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="Fedora 18 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -548,7 +548,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="Fedora 18 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -575,7 +575,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="Fedora 18 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="Fedora 18 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="Fedora 18 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -611,7 +611,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="Fedora 18 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -656,7 +656,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="Fedora 18 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 362308a60022bef0f1f19597ade25e7f316e8137..93732d7dc31bf7c28afc96f22b4051f6f912f53a 100755 (executable)
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -503,7 +503,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="Mandriva 2010.0 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -548,7 +548,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="Mandriva 2010.0 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -575,7 +575,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="Mandriva 2010.0 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="Mandriva 2010.0 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="Mandriva 2010.0 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -611,7 +611,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="Mandriva 2010.0 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -656,7 +656,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="Mandriva 2010.0 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_Ubuntu_13.10_64bit.xml b/config_Ubuntu_13.10_64bit.xml
index 09620625ed3f658e5526ea546a88deeac9e604e9..c2b27397ff9bacce97da2c92883f739840dde973 100644 (file)
--- a/config_Ubuntu_13.10_64bit.xml
+++ b/config_Ubuntu_13.10_64bit.xml
@@ -503,7 +503,7 @@
             type="prerequisite"
              description="Open CASCADE Technology">
       <installation os="Ubuntu 13.10 64bit"
-                    version="6.7.1" 
+                    version="6.8.0" 
                    disable="false"
                    installdiskspace="157084,428325,1392563"
                    script="OCCT.sh"/>
@@ -548,7 +548,7 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="Ubuntu 13.10 64bit"
-                    version="3.0.7" 
+                    version="3.0.8p1" 
                    disable="false"
                    installdiskspace="140767,165002,375774"
                    script="med.sh"/>
@@ -575,7 +575,7 @@
             type="prerequisite"
             description="Scalable, open-source visualization application">
       <installation os="Ubuntu 13.10 64bit"
-                    version="4.1.0" 
+                    version="4.2.0" 
                    disable="false"
                    installdiskspace="227278,240114,1492710"
                    script="ParaView.sh"/>
@@ -584,7 +584,7 @@
             type="prerequisite"
             description="Fundamental package for scientific computing with Python">
       <installation os="Ubuntu 13.10 64bit"
-                    version="1.7.1" 
+                    version="1.8.1" 
                    disable="false"
                    installdiskspace="27506,74020,193436"
                    script="numpy.sh"/>
@@ -593,7 +593,7 @@
             type="prerequisite"
              description="Generic batch management library">
       <installation os="Ubuntu 13.10 64bit"
-                    version="2.1.0" 
+                    version="2.2.0" 
                    disable="false"
                    installdiskspace="954,1300,5190"
                    script="libBatch.sh"/>
@@ -611,7 +611,7 @@
             type="prerequisite"
              description="Graph Drawing Programs set">
       <installation os="Ubuntu 13.10 64bit"
-                    version="2.30.0" 
+                    version="2.38.0" 
                    disable="false"
                    installdiskspace="11771,68067,112612"
                    script="graphviz.sh"/>
@@ -656,7 +656,7 @@
             type="prerequisite"
              description="DISTENE meshing tools">
       <installation os="Ubuntu 13.10 64bit"
-                    version="1.1" 
+                    version="1.3-8" 
                    disable="false"
                    installdiskspace="164468,0,164468"
                    script="DISTENE.sh"/>

diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh
index bfe5d48d03ccb864fd025eb5fd2683f08bcd7c05..f52680b36e576251631f9f13918f86a9e5d66e89 100755 (executable)
--- 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 f8e8af4810e5626b89e2fe07472d2089d9d91eb0..292f3898899236f2a585bc6c3ce1cc690d2d9fef 100755 (executable)
--- 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 2d9710ebda1b0b3f5e7555afd5a38ba0a415eebf..2852f555ff6512ea2aad7a155d7e98962e6f7820 100755 (executable)
--- 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 6218392f95cd5953fec735d51081a87ef522f385..fde40405183dbe34de71f7d5e3248e2c372c3b77 100755 (executable)
--- 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 <<EOF
 -------------------

diff --git a/config_files/libBatch.sh b/config_files/libBatch.sh
index 7717b05a24faf8c1be4f66569ae9c1c91efd21fc..8848be5504b4dba25ea6b3628ad47f7ace28ca4d 100755 (executable)
--- a/config_files/libBatch.sh
+++ b/config_files/libBatch.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-LIBBATCH_VERSION=2.1.0
+LIBBATCH_VERSION=2.2.0
 
 check_version(){
 # No way to check version!

diff --git a/config_files/med.sh b/config_files/med.sh
index 255b05ea1a430d5d8d9a74808008a00088732b41..884c9efe83beeaeb8ac8a4e1568e7757118766f8 100755 (executable)
--- a/config_files/med.sh
+++ b/config_files/med.sh
@@ -15,7 +15,7 @@
 #
 # med library version
 #
-VERSION_MED=3.0.7
+VERSION_MED=3.0.8
 
 check_version()
 {
@@ -36,6 +36,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export MEDFILE_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PATH=\${MEDFILE_ROOT_DIR}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${MEDFILE_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${MEDFILE_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/numpy.sh b/config_files/numpy.sh
index 6ae5e8de8f477f5bc5cc18fcedeb35443057930f..678e477e5534706c871ff675bdde41f20ee93f9c 100755 (executable)
--- a/config_files/numpy.sh
+++ b/config_files/numpy.sh
@@ -15,8 +15,8 @@
 #
 # numpy and lapack versions
 #
-VERSION_NUMPY=1.7.1
-VERSION_LAPACK=3.4.2
+VERSION_NUMPY=1.8.1
+VERSION_LAPACK=3.5.0
 
 check_version(){
 # It is not necessary to check version!
@@ -83,7 +83,7 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 cd ${PRODUCT_SRC_DIR}/lapack-${VERSION_LAPACK}_SRC
 
 # lapack cmake options
-local CMAKE_OPTIONS=""
+local CMAKE_OPTIONS="."
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=${PRODUCT_DIR}"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
@@ -94,7 +94,7 @@ cat > ${PRODUCT_DIR}/CONFIGURE_LAPACK.LOG <<EOF
 Used options: ${CMAKE_OPTIONS}
 -------------------
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE_LAPACK.LOG cmake . ${CMAKE_OPTIONS}
+check_job ${PRODUCT_DIR}/CONFIGURE_LAPACK.LOG cmake ${CMAKE_OPTIONS}
 check_job ${PRODUCT_DIR}/MAKE_LAPACK.LOG make VERBOSE=1
 check_job ${PRODUCT_DIR}/INSTALL_LAPACK.LOG make VERBOSE=1 install