From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 18 Nov 2022 15:20:34 +0000 (+0100)
Subject: 0/ ParaView: use final tag 5.11.0 1/ PV_PLUGIN_PATH: indeed expanding this environmen... 
X-Git-Tag: V9_11_0~180
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e2c045558b376da7c48417074ae2a10ce6caa91a;p=tools%2Fsat_salome.git

0/ ParaView: use final tag 5.11.0 1/ PV_PLUGIN_PATH: indeed expanding this environment variable is required in order to be able to view plugins from PARAVIS - EDF (Duc) request on 18/11/22
---

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index ee44539..94aa8c0 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -33,7 +33,7 @@ default :
 version_5_11_0 :
 {
     compil_script :  'ParaView-5.11.0.sh'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     patches : [
                'paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch'
@@ -57,7 +57,7 @@ version_5_11_0 :
 version_5_11_0_int32 :
 {
     compil_script :  'ParaView-5.11.0.sh'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     # two other LATA patches already included in archive
     patches : [
                'paraview-5.11.0.p001-FindCGNS.patch'
@@ -81,7 +81,7 @@ version_5_11_0_int32 :
 version_5_11_0_win :
 {
     compil_script :  'ParaView-5.11.0.bat'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     depend : [
               'Python',
               'hdf5',
@@ -104,7 +104,7 @@ version_5_11_0_win :
 version_5_11_0_win_dbg :
 {
     compil_script :  'ParaView-5.11.0.bat'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     depend : [
               'Python',
               'hdf5',
@@ -128,7 +128,7 @@ version_5_11_0_win_dbg :
 version_5_11_0_MPI :
 {
     compil_script :  'ParaView-5.11.0.sh'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     patches : ['paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p002-FindMPI.patch'
               ]
@@ -151,7 +151,7 @@ version_5_11_0_MPI :
 version_5_11_0_MPI_LATA_64BITS_IDS :
 {
     compil_script :  'ParaView-5.11.0.sh'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     patches : ['paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-0012-LATA_64BITS_IDS.patch'
@@ -161,7 +161,7 @@ version_5_11_0_MPI_LATA_64BITS_IDS :
 version_5_11_0_MPI_DB10 :
 {
     compil_script :  'ParaView-5.11.0.sh'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     patches : ['paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch'
@@ -185,7 +185,7 @@ version_5_11_0_MPI_DB10 :
 version_5_11_0_MPI_CO8 :
 {
     compil_script :  'ParaView-5.11.0.sh'
-    archive_info : {archive_name : "ParaView-5.11.0-RC2.tar.gz"}
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
     patches : ['paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch'
diff --git a/products/env_scripts/ParaView.py b/products/env_scripts/ParaView.py
index 192b6e8..c02be96 100644
--- a/products/env_scripts/ParaView.py
+++ b/products/env_scripts/ParaView.py
@@ -52,7 +52,7 @@ def set_paraview_env(env, version):
         paralib = os.path.join(root, lib_dir, 'paraview-' + version)
         env.prepend('PV_PLUGIN_PATH', paralib)
         # bos #26828
-        #env.prepend('PV_PLUGIN_PATH', os.path.join(paralib, 'plugins'))
+        env.prepend('PV_PLUGIN_PATH', os.path.join(paralib, 'plugins'))
         env.prepend('PYTHONPATH', os.path.join(paralib, 'site-packages'))
         env.prepend('PYTHONPATH', os.path.join(paralib, 'site-packages', 'vtk'))
         env.prepend('PATH', os.path.join(root, 'include', 'paraview-' + version))