From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 6 Apr 2021 12:33:18 +0000 (+0200)
Subject: fix - psutil is not required for SALOME 9.6.0 downwards.
X-Git-Tag: V9_7_0~63^2~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2c530939ddf1cf5892515e634b8dd44ac494757;p=tools%2Fsat_salome.git

fix - psutil is not required for SALOME 9.6.0 downwards.
---

diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf
index 4f6e21d..5ee554b 100644
--- a/products/GEOM.pyconf
+++ b/products/GEOM.pyconf
@@ -55,7 +55,7 @@ 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 :
+version_V9_3_0_to_V9_6_0 :
 {
     depend : ["KERNEL",
               "GUI",
@@ -77,7 +77,7 @@ version_9_3_0_to_9_6_0 :
              ]
 }
 
-_from_8_5_0_to_9_2_1 :  # these versions requires the path geom_8.5.0_xao_data_dir.patch (for salome test)
+version_V8_5_0_to_V9_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" 
@@ -102,7 +102,7 @@ _from_8_5_0_to_9_2_1 :  # these versions requires the path geom_8.5.0_xao_data_d
              ]
 }
 
-_from_7_5_0_to_7_8_3 :
+version_V7_5_0_to_V7_8_3 :
 {
     depend : ["KERNEL",
               "GUI",
diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 5f93e72..72d73f4 100644
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -93,6 +93,28 @@ default_MPI :
               ]
 }
 
+version_V8_5_0_to_V9_6_0:
+{
+    depend : ["Python",
+              "boost",
+              "cppunit",
+              "numpy",
+              "lapack",
+              "hdf5",
+              "omniORB",
+              "omniORBpy",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "pytz",
+              "LIBBATCH"
+              ]
+}
+
 version_7_8_0_to_8_4_0 :
 {
     depend : ["Python",