spns #43062: new key break V9_11_0, V9_12_0 and V9_13_0 PARAVIS tags

diff --git a/applications/SALOME-9.12.0-MPI.pyconf b/applications/SALOME-9.12.0-MPI.pyconf
index 42315bc66ebb8123206b8f6ca09270e62d872431..edbcde1eecab68a7e33fceddbd5e7ee384b6fbb6 100644 (file)
--- a/applications/SALOME-9.12.0-MPI.pyconf
+++ b/applications/SALOME-9.12.0-MPI.pyconf
@@ -162,7 +162,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'    : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'FIELDS'    : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
-        'PARAVIS'   : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS'   : {tag:'V9_12_0', base: 'no', section: 'version_V9_12_0_MPI', hpc: 'yes'}
         'JOBMANAGER': {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.12.0-int32.pyconf b/applications/SALOME-9.12.0-int32.pyconf
index e245204684df5c7aa950444f6bc47cc396a5fa26..f05dbf6aed0c2d34b62662ed44784b6009d0510e 100644 (file)
--- a/applications/SALOME-9.12.0-int32.pyconf
+++ b/applications/SALOME-9.12.0-int32.pyconf
@@ -161,7 +161,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'version_V9_12_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.12.0.pyconf b/applications/SALOME-9.12.0.pyconf
index 07d32aa1b72d499acd570bc6157433518b963053..3b120d4e06afef887a51c69e2e379e0ca5a741ab 100644 (file)
--- a/applications/SALOME-9.12.0.pyconf
+++ b/applications/SALOME-9.12.0.pyconf
@@ -162,7 +162,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'version_V9_12_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf
index de393d4d2a8abddc4c1df603050962155bf65910..2568d92e9eda8d6ca6988013dd6df6eb4970c31d 100644 (file)
--- a/applications/SALOME-9.13.0-MPI.pyconf
+++ b/applications/SALOME-9.13.0-MPI.pyconf
@@ -184,7 +184,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'    : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'FIELDS'    : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
-        'PARAVIS'   : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS'   : {tag:'V9_13_0', base: 'no', section: 'V9_13_0_MPI', hpc: 'yes'}
         'JOBMANAGER': {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.13.0-int32.pyconf b/applications/SALOME-9.13.0-int32.pyconf
index ba8deaf3785f629badfaf0068f4d0f5ff952968b..bef2109fb45a0eee45adc3e17de93646679d3ffb 100644 (file)
--- a/applications/SALOME-9.13.0-int32.pyconf
+++ b/applications/SALOME-9.13.0-int32.pyconf
@@ -183,7 +183,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'version_V9_13_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/applications/SALOME-9.13.0.pyconf b/applications/SALOME-9.13.0.pyconf
index fe028610bf39ea99d817332d5f7ef9092216453f..d396d1986f768eceb56efbe7aeba7896b42af9e1 100644 (file)
--- a/applications/SALOME-9.13.0.pyconf
+++ b/applications/SALOME-9.13.0.pyconf
@@ -170,7 +170,7 @@ APPLICATION :
         'RESTRICTED'
         'LIBBATCH' : 'V2_5_0'
         'KERNEL'
-        'MEDCOUPLING' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'MEDCOUPLING' : {tag:'V9_13_0', base: 'no', section: 'version_V9_13_0_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -184,7 +184,7 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'version_V9_13_0_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'

diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf
index 52d26c2390b14b882ceb2bdc5cf6910aae32cb32..f17aab7151f614dfa19fd0b4d059b38b009b7515 100644 (file)
--- a/products/PARAVIS.pyconf
+++ b/products/PARAVIS.pyconf
@@ -109,6 +109,39 @@ default_MPI :
     patches : []
 }
 
+version_V9_13_0 :
+{
+    git_commands: []
+}
+
+version_V9_13_0_MPI :
+{
+    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 : []
+    git_commands: []
+}
+
 version_V9_13_0_UB24_04 :
 {
    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} "
@@ -136,6 +169,44 @@ version_V9_13_0_UB24_04 :
    patches: ['PARAVIS-UB24.04-V9_13_0-PyUnicode_AsWideCharString.patch']
 }
 
+version_V9_12_0 :
+{
+    git_commands: []
+}
+
+version_V9_12_0_MPI :
+{
+    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 : []
+    git_commands: []
+}
+
+version_V9_11_0 :
+{
+    git_commands: []
+}
+
 version_V9_11_0_MPI :
 {
     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} "