Add psutil in master configurations - Test dedicated KERNEL branch

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 440375b508c5925df8502c3068656c0d14ec6440..3d0b2d89f69632405510e7dfb662f26f0fc5bd63 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -79,6 +79,7 @@ APPLICATION :
         petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -114,7 +115,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_4_4'}
-        'KERNEL' : {section : 'default_MPI', verbose : 'yes'}
+        'KERNEL' : {section : 'default_MPI', verbose : 'yes', tag : 'occ/psutil'}
         'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'}
         'GUI' : {verbose : 'yes'}
         'GEOM'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index d63c8ee7abcdbfe150f246217e8eb4b611c70f01..4c9490493951881b323f01c8d17bb1b52479bd24 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -86,6 +86,7 @@ APPLICATION :
         perl : '5.28.1.1'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
+        psutil : '5.7.2'
         pthreads : '2.9.1'
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
@@ -129,7 +130,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_4_4'}
-        'KERNEL'
+        'KERNEL' : {tag : 'occ/psutil'}
         'MEDCOUPLING'
         'GUI'
         'GEOM'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 55e049f4e6e3ba2b554e9d3191416584001728c5..b2bb7ff435411da21bd14f5769133f8fbda5132e 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -78,6 +78,7 @@ APPLICATION :
         petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -113,7 +114,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_4'}
-        'KERNEL'
+        'KERNEL' : {tag : 'occ/psutil'}
         'MEDCOUPLING'
         'GUI'
         'GEOM'

diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf
index 40df2415106ae693da10318a37c70ae598820bd6..efa7d1b788b2321a95f7ba1d3ff038a4e4d1dd9b 100644 (file)
--- a/products/GEOM.pyconf
+++ b/products/GEOM.pyconf
@@ -33,7 +33,8 @@ default :
               "Pygments",
               "opencv",
               "six",
-              "pytz"
+              "pytz",
+              "psutil"
              ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
     patches : []
@@ -54,11 +55,51 @@ default_win :
     cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR:\=/% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS:\=/% "
 }
 
+version_9_3_0_to_9_6_0 :
+{
+    depend : ["KERNEL",
+              "GUI",
+              "boost",
+              "CAS",
+              "Python",
+              "hdf5",
+              "omniORB",
+              "qt",
+              "ParaView",
+              "docutils",
+              "Sphinx",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "opencv",
+              "six",
+              "pytz"
+             ]
+}
+
 _from_8_5_0_to_9_2_1 :  # these versions requires the path geom_8.5.0_xao_data_dir.patch (for salome test)
 {
     patches : [
               "geom_8.5.0_xao_data_dir.patch" 
               ]
+    depend : ["KERNEL",
+              "GUI",
+              "boost",
+              "CAS",
+              "Python",
+              "hdf5",
+              "omniORB",
+              "qt",
+              "ParaView",
+              "docutils",
+              "Sphinx",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "opencv",
+              "six",
+              "pytz"
+             ]
 }
 
 version_V6_6_0 :