spns #33861: implement a full MEDCOUPLING 9.7.0 with native dependencies library

diff --git a/applications/MEDCOUPLING-9.7.0-native.pyconf b/applications/MEDCOUPLING-9.7.0-native.pyconf
index 02490d0275e3a0a45c6e43eabbf74c93d5dbab61..729da15093d8d5bae9fba4e0437facacd0020121 100644 (file)
--- a/applications/MEDCOUPLING-9.7.0-native.pyconf
+++ b/applications/MEDCOUPLING-9.7.0-native.pyconf
@@ -29,23 +29,25 @@ APPLICATION :
         boost : 'native'
         certifi : 'native'
         click : 'native'
-        cmake : 'native' 
+        cmake : '3.24.2'
         cppunit : 'native'
         chardet : 'native'
         Cython : 'native'
         docutils : 'native'
         doxygen : 'native'
         graphviz : 'native'
-        hdf5 : '1.10.3'
+        hdf5 : 'native'
         idna : 'native'
         imagesize : 'native'
         Jinja2 : 'native'
         lapack : 'native'
         libxml2 : 'native'
         markupsafe : 'native'
-        medfile : {section: 'default_Autotools', tag: '4.1.0'}
+        medfile : {tag : '4.1.0', hpc : 'yes', section : 'version_4_1_0_hdf5' }
         metis : 'native'
+        mpi4py: 'native'
         numpy : 'native'
+        openmpi : 'native'
         pockets : 'native'
         Pygments : 'native'
         pyparsing : 'native'
@@ -64,10 +66,10 @@ APPLICATION :
         swig : 'native'
         packaging : 'native'
         urllib3 : 'native'
-
+        salome_system : 'native'
         # SALOME MODULES :
         'CONFIGURATION'
-        'MEDCOUPLING'
+        'MEDCOUPLING' : {tag:'V9_7_0', base: 'no', section: 'default_MPI_STD', hpc: 'yes'}
     }
     test_base : 
     {
@@ -89,6 +91,6 @@ __overwrite__ :
       __condition__ : "VARS.dist in ['CO8']"
       'APPLICATION.products.sphinxintl' : '0.9.10'
       'PRODUCTS.sphinxintl.default.properties.pip' : "no"
-      'APPLICATION.products.cmake' : '3.12.1'
+      'APPLICATION.products.cmake' : '3.24.2'
    }
 ]

diff --git a/products/medfile.pyconf b/products/medfile.pyconf
index a13ebbed39ef301ed6540d7a032cd8e4e94b4642..b45a5bbf19d550054bde92bfc75695e91ea5bde4 100644 (file)
--- a/products/medfile.pyconf
+++ b/products/medfile.pyconf
@@ -82,6 +82,14 @@ version_4_1_0 :
   patches : []
 }
 
+# needed in order to screen with windows version - see below
+version_4_1_0_hdf5 :
+{
+  compil_script :  "med.sh"
+  test_build : "make check"
+  patches : ['medfile-4.1.0-hdf5.patch']
+}
+
 version_4_1_0_win : 
 {
   patches : ['med-4.1.0_win_3x_files_support.patch', 'med-4.1.0_hdf5_native_long.patch']

diff --git a/products/patches/medfile-4.1.0-hdf5.patch b/products/patches/medfile-4.1.0-hdf5.patch
new file mode 100644 (file)
index 0000000..6c8232a
--- /dev/null
+++ b/products/patches/medfile-4.1.0-hdf5.patch
@@ -0,0 +1,41 @@
+--- med-4.1.0_ref/configure    2020-03-11 12:53:46.000000000 +0100
++++ med-4.1.0_dev/configure    2023-02-24 13:55:54.089750280 +0100
+@@ -7577,12 +7577,12 @@
+          H5_VER_MINOR=`  grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
+          H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed  's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
+          HDF5_VERSION=`  expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
+-         test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
+-This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
+-The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
+-DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
+-This would BREAK med-fichier compatibility between files with the same revision number !
+-      " "$LINENO" 5
++#          test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
++# This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
++# The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
++# DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
++# This would BREAK med-fichier compatibility between files with the same revision number !
++#       " "$LINENO" 5
+      else
+ ## In case user explicitly ask to not use hdf5 !
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't compile MED without hdf5" >&5
+@@ -31697,7 +31697,8 @@
+      case $am_cv_python_pythondir in
+      $am_py_prefix*)
+        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       # am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
+        ;;
+      *)
+        case $am_py_prefix in
+@@ -31741,7 +31742,8 @@
+      case $am_cv_python_pyexecdir in
+      $am_py_exec_prefix*)
+        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       # am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
+        ;;
+      *)
+        case $am_py_exec_prefix in