fix - psutil is not required for SALOME 9.6.0 downwards.

diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf
index 4f6e21daf28bc38743842edcdcfc1dd495ebeedf..5ee554b2f680d71ea9e0b5cbe6e79c77da31df4a 100644 (file)
--- 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 5f93e72e9136664fd924c85150ffdfc17e598de0..72d73f4dec783aab153d7f5ae9d8a8062c2bc4b2 100644 (file)
--- 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",