From 9c8ae8c53487431df320cead6728677980553026 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Wed, 4 Apr 2012 07:09:05 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: ParaView 3.10.1 -> 3.14.0

---
 config_CentOS_5.5_64bit.xml                   |  4 +-
 config_Debian_4.0.xml                         |  4 +-
 config_Debian_4.0_64bit.xml                   |  4 +-
 config_Debian_5.0_64bit.xml                   |  4 +-
 config_Debian_6.0_64bit.xml                   |  4 +-
 config_Mandriva_2008.0.xml                    |  4 +-
 config_Mandriva_2008.0_64bit.xml              |  4 +-
 config_Mandriva_2010.0.xml                    |  4 +-
 config_Mandriva_2010.0_64bit.xml              |  4 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml      |  4 +-
 config_Scientific_SL_5.1_64bit.xml            |  4 +-
 .../{ParaView-3.10.sh => ParaView.sh}         | 41 ++++++++++---------
 12 files changed, 44 insertions(+), 41 deletions(-)
 rename config_files/{ParaView-3.10.sh => ParaView.sh} (95%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index b873d47..6db969b 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="CentOS 5.5 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index f7b5e0a..b5359d7 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Debian 4.0"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 242bb6f..5d2f6fe 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Debian 4.0 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 1349f03..9a3b7df 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Debian 5.0 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 9151750..0d4ecb1 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Debian 6.0 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 9ce738e..5eb8ff0 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Mandriva 2008.0"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index d884d0c..cedd5e4 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Mandriva 2008.0 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 9663389..044adff 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Mandriva 2010.0"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 7045751..4d5f4e8 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Mandriva 2010.0 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 22a0f7f..e24c01c 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 6eafa57..2089205 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -567,10 +567,10 @@
 	     type="prerequisite"
 	     description="Scalable, open-source visualization application">
       <installation os="Scientific SL 5.1 64bit"
-                    version="3.10" 
+                    version="3.14.0" 
 		    disable="false"
 		    installdiskspace="245476,193252,1157792"
-		    script="ParaView-3.10.sh"/>
+		    script="ParaView.sh"/>
     </product>
     <product name="numpy"
 	     type="prerequisite"
diff --git a/config_files/ParaView-3.10.sh b/config_files/ParaView.sh
similarity index 95%
rename from config_files/ParaView-3.10.sh
rename to config_files/ParaView.sh
index 60905e2..bdd62f6 100755
--- a/config_files/ParaView-3.10.sh
+++ b/config_files/ParaView.sh
@@ -1,12 +1,12 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : ParaViev-3.10.sh
+#  File      : ParaView.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
+#  Copyright : 2002-2012 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -15,7 +15,7 @@
 #
 # Paraview version and lib version
 #
-PVVERSION=3.10.1
+PVVERSION=3.14.0
 PVLIBVERSION=`echo ${PVVERSION} | awk -F. '{printf("%d.%d",$1,$2)}'`
 
 check_version()
@@ -76,21 +76,21 @@ fi
 check_jb tar xfz ${data_archive} -C ${INST_ROOT}
 
 ### patch paraview
-# 1. patch for ParaViewLibraryDepends.cmake problem (ParaView 3.10.0) [OBSOLETE]
+# 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 )
 fi
-# 2. patch for missing PyVTKMutableObject.h (ParaView 3.10 development version) [OBSOLETE]
+# 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 )
 fi
-# 3. patch for ftgl (incompatibility with OCCT 6.5)
-need_patch_ftgl=1
+# 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 )
@@ -111,6 +111,7 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
 mkdir ${PRODUCT_BUILD_DIR}
 cd ${PRODUCT_BUILD_DIR}
+
 # get Python and tcl/tk version
 python_version="`python -c 'import sys; print sys.version[:3]'`"
 tcl_version=""
@@ -123,7 +124,7 @@ if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
     if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
     tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
 fi
-    
+
 CMAKE_OPTIONS=""
 
 ### common settings
@@ -230,30 +231,35 @@ if [ "${with_mesa}" == "1" ] && [ "$MESA_HOME" != "" ] ; then
   CMAKE_OPTIONS=$CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
 fi
 
+# configure
+    
 cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 cmake  : `which cmake`
 python : `which python`
 tclsh  : `which tclsh`
 qmake  : `which qmake`
 
-used VTK settings:
+used ParaView configuration options:
 $CMAKE_OPTIONS
 EOF
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $CMAKE_OPTIONS
+
+# make
+
 cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
+used gcc=`which gcc`
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
 
-#######
-# `make install` has been replaced by `cpack` since Paraview 3.10.0
-#######
+# 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
    
     ### Patch binaries
-    # 1. patch for missing libvtkPV*.so libraries (ParaView 3.10 development version) [OBSOLETE]
+    # - 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}
@@ -274,10 +280,8 @@ else
     fi
 fi 
 
-#######
-# patch Paraview problem (bad VisItBridge configuration)
-# NOT NEEDED SINCE PARAVIEW 3.10.1
-#######
+### 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
@@ -328,7 +332,6 @@ sed -e "s%/[^\";]*/bin/moc%$QTDIR/bin/moc%g"     \
     mv -f ${f}.new ${f}
 done
 
-
 # to generate environment script for sources
 try_preinstalled
 }
-- 
2.39.2