bos #38525: Append PYTHONPATH for PARAVIS: import MEDReader directly in VTK without...

diff --git a/applications/SALOME-9.10.0-int32.pyconf b/applications/SALOME-9.10.0-int32.pyconf
index b3d540166003642c016e3b3cdf432a72406ab276..7184c622b98a2f8d606c5388bbe4485c39462dcc 100644 (file)
--- a/applications/SALOME-9.10.0-int32.pyconf
+++ b/applications/SALOME-9.10.0-int32.pyconf
@@ -161,7 +161,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.10.0-native.pyconf b/applications/SALOME-9.10.0-native.pyconf
index d7a346085865df8b6f20b3bce170d311a50ef636..dd59af93ddf786d27ccb843cbe69662d6f2f681b 100644 (file)
--- a/applications/SALOME-9.10.0-native.pyconf
+++ b/applications/SALOME-9.10.0-native.pyconf
@@ -159,7 +159,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.10.0.pyconf b/applications/SALOME-9.10.0.pyconf
index fe6defc0abb916e441cd8da91b6b6c0681b9954c..42f3341a615612a2c4f141455cb0192323a5346e 100644 (file)
--- a/applications/SALOME-9.10.0.pyconf
+++ b/applications/SALOME-9.10.0.pyconf
@@ -162,7 +162,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.11.0-int32.pyconf b/applications/SALOME-9.11.0-int32.pyconf
index 4b2523f372576461fa4da8cc01d89b17ceb66b61..85793208f6d4a4e5507a44554616c806c51f331f 100644 (file)
--- a/applications/SALOME-9.11.0-int32.pyconf
+++ b/applications/SALOME-9.11.0-int32.pyconf
@@ -161,7 +161,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'version_V9_11_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.11.0-native.pyconf b/applications/SALOME-9.11.0-native.pyconf
index 09386648d963e0c4b6f0e0ff40733b6f356073f6..b1e76e7ed0f4681ef2b58c0c16b6bd1a5ede0cb1 100644 (file)
--- a/applications/SALOME-9.11.0-native.pyconf
+++ b/applications/SALOME-9.11.0-native.pyconf
@@ -159,7 +159,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS': {tag:'V9_11_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS': {tag:'V9_11_0', base: 'no', section: 'version_V9_11_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.11.0.pyconf b/applications/SALOME-9.11.0.pyconf
index b8dbd9ea18ec3c9f26571969173a002235acd816..f210eb24d87e6718fb070aa9b09aded40a092a72 100644 (file)
--- a/applications/SALOME-9.11.0.pyconf
+++ b/applications/SALOME-9.11.0.pyconf
@@ -162,7 +162,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'version_V9_11_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf
index 0fe6a2969e6b6008f39425cdd0708d033c166311..8fd9adbd804e744964b4de47737abd7ff664616e 100644 (file)
--- a/products/PARAVIS.pyconf
+++ b/products/PARAVIS.pyconf
@@ -11,8 +11,9 @@ default :
     }
     environ :
     {
-        _PV_PLUGIN_PATH : $install_dir + $VARS.sep + "lib" + $VARS.sep + "paraview"
+        _PV_PLUGIN_PATH  : $install_dir + $VARS.sep + "lib" + $VARS.sep + "paraview"
         SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "paravis"
+        env_script       : "PARAVIS.py"
     }
     depend : [
        "KERNEL",
@@ -100,10 +101,31 @@ default_MPI :
     patches : []
 }
 
-
-version_V9_7_0_to_V9_8_0 :
+version_V9_11_0_MPI :
 {
-    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON"
+    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON  -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} "
+    depend : [
+       "KERNEL",
+       "GUI",
+       "MEDCOUPLING",
+       "FIELDS",
+       "GEOM",
+       "SMESH",
+       "Python",
+       "qt",
+       "boost",
+       "hdf5",
+       "medfile",
+       "ParaView",
+       "CAS",
+       "omniORB",
+       "docutils",
+       "libxml2",
+       "six",
+       "pytz",
+       "openmpi"
+    ]
+    patches : []
 }
 
 version_V9_10_0_MPI :
@@ -158,6 +180,10 @@ version_V9_9_0_MPI :
        "openmpi"
     ]
 }
+version_V9_8_0 :
+{
+    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON"
+}
 
 version_V9_8_0_MPI :
 {
@@ -185,6 +211,11 @@ version_V9_8_0_MPI :
     ]
 }
 
+version_V9_7_0 :
+{
+    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON"
+}
+
 version_V9_6_0 :
 {
    patches : ['PARAVIS-MEDLoaderForPV-64BITS_IDS.patch'] # port-back post-9.6.0 PARAVIS fix # bos #20444
@@ -219,12 +250,12 @@ version_V9_6_0_MPI :
 
 version_V9_4_0 :
 {
-    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON "
+   cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON "
 }
 
 version_V9_3_0 :
 {
-    cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON "
+   cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON "
 }
 
 version_7_8_0_to_9_1_0 :

diff --git a/products/env_scripts/PARAVIS.py b/products/env_scripts/PARAVIS.py
new file mode 100644 (file)
index 0000000..368fbc7
--- /dev/null
+++ b/products/env_scripts/PARAVIS.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+import os
+
+def set_env(env, prereq_dir, version):
+    fVersions =['V9_11_0', 'V9_10_0', 'V9_9_0', 'V9_8_0']
+    fVersions+=['V9_7_0',  'V9_6_0',  'V9_5_0', 'V9_4_0']
+    fVersions+=['V9_3_0',  'V9_2_1',  'V9_2_0', 'V9_1_0']
+    fVersions+=['V8_5_0',  'V7_8_0', 'V6_6_0']
+    if not version in fVersions:
+        pyver = 'python' + env.get('PYTHON_VERSION')
+        env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
+
+def set_nativ_env(env):
+    pass