support FD38

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 228011efad24b353e57f57e5ae18709b10133693..9a9e792461e5f876a366ec4cf9cd1a10deb61bf2 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -11,7 +11,7 @@ APPLICATION :
     debug : 'no'
     base : 'no'
     python3 : 'yes'
-    platform : ["FD32", "FD34", "FD36", "FD37", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"]
+    platform : ["FD32", "FD34", "FD36", "FD37", "FD38", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"]
     environ :
     {
         build :
@@ -318,4 +318,22 @@ __overwrite__ :
         'APPLICATION.products.CONFIGURATION'    : {tag:'master',     base: 'no', section: 'default'                             }
         'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                  hpc: 'no' }
     }
+
+    {
+        __condition__ : "VARS.dist in ['FD38']"
+        'APPLICATION.rm_products' : ['root', 'URANIE', 'mesa']
+        'APPLICATION.products.cmake'            : 'native'
+        'APPLICATION.products.opencv'           : {tag: '3.2.0',     base: 'no', section: 'version_3_2_0_FD38'                  }
+        'APPLICATION.products.omniORB'          : '4.2.5'
+        'APPLICATION.products.omniORBpy'        : '4.2.5'
+        'APPLICATION.products.qwt'              : '6.1.6'
+        'APPLICATION.products.nlopt'            : '2.6.0'
+        'APPLICATION.products.netcdf'           : '4.6.2'
+        'APPLICATION.products.numpy'            : {tag: '1.22.2',    base: 'no', section: 'version_1_22_2'                      }
+        'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_FD38'                    }
+        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD38'                  }
+        'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no',  section: 'version_5_11_0_MPI_FD38', hpc: 'yes'}
+        'APPLICATION.products.CONFIGURATION'    : {tag:'master',     base: 'no', section: 'default'                             }
+        'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                  hpc: 'no' }
+    }
 ]

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index e09057f443fd8cda517235251b1627b1436f46c9..374cce3d58e30fee0045f5739d27d2cdd1c1b206 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -209,6 +209,27 @@ version_5_11_1_MPI_CO8 :
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
 }
 
+version_5_11_1_MPI_FD38 :
+{
+    compil_script :  'ParaView-5.11.1.sh'
+    archive_info : {archive_name : "ParaView-5.11.1.tar.gz"}
+    patches : []
+    depend : [
+              'Python',
+              'hdf5',
+              'qt',
+              'PyQt',
+              'sip',
+              'boost',
+              'libxml2',
+              'freetype',
+              'matplotlib',
+              'cgns',
+              'Pygments'
+              ]
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
+}
+
 version_5_11_1_MPI_FD37 :
 {
     compil_script :  'ParaView-5.11.1.sh'
@@ -428,6 +449,31 @@ version_5_11_0_MPI_CO8 :
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
 }
 
+version_5_11_0_MPI_FD38 :
+{
+    compil_script :  'ParaView-5.11.0.sh'
+    archive_info : {archive_name : "ParaView-5.11.0.tar.gz"}
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch',
+               'paraview-5.11.0.p006-GIL.patch',
+                    'paraview-5.11.0.p007-mpi4py-FD37.patch'
+              ]
+    depend : [
+              'Python',
+              'hdf5',
+              'qt',
+              'PyQt',
+              'sip',
+              'boost',
+              'libxml2',
+              'freetype',
+              'matplotlib',
+              'cgns',
+              'Pygments'
+              ]
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
+}
+
 version_5_11_0_MPI_FD37 :
 {
     compil_script :  'ParaView-5.11.0.sh'

diff --git a/products/PyFMI.pyconf b/products/PyFMI.pyconf
index 60c94de317a6daa6c85abebc4d27179e62e07f5c..47d5874bf3941a2d62cd1b9e15d5f51b1041b4ca 100644 (file)
--- a/products/PyFMI.pyconf
+++ b/products/PyFMI.pyconf
@@ -47,6 +47,18 @@ version_2_6_UB22_04:
       pip : "no"
     }
 }
+
+version_2_6_FD38:
+{
+    patches: ['pyfmi-2.6-python-3.1x.01.patch']
+    compil_script : "PyFMI-2.6.sh"
+    properties:
+    {
+      incremental : "yes"
+      pip : "no"
+    }
+}
+
 version_2_6_FD37:
 {
     patches: ['pyfmi-2.6-python-3.1x.01.patch']

diff --git a/products/Python.pyconf b/products/Python.pyconf
index 05b774c3ae1f2104b82c706d35977c87994e34ce..6391bc45ecae8eb4d27d37c9a5279a6ef42aa010 100755 (executable)
--- a/products/Python.pyconf
+++ b/products/Python.pyconf
@@ -50,6 +50,11 @@ version_3_6_5_UB22_04:
   patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
 }
 
+version_3_6_5_FD38:
+{
+  patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889
+}
+
 version_3_6_5_FD37:
 {
   patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889

diff --git a/products/boost.pyconf b/products/boost.pyconf
index ef40ee221f0bf40520bee90324e48f52b2c1e018..980a86e7a0c54658f352e0e5606d1c9687364ece 100644 (file)
--- a/products/boost.pyconf
+++ b/products/boost.pyconf
@@ -45,6 +45,12 @@ version_1_71_0_UB22_04 :
     patches : ['boost-1.71-pthread-gcc-11.patch']
 }
 
+version_1_71_0_FD38 :
+{
+    compil_script : "boost-1.71.0.sh"
+    patches : ['boost-1.71-pthread-gcc-11.patch']
+}
+
 version_1_71_0_FD37 :
 {
     compil_script : "boost-1.71.0.sh"

diff --git a/products/compil_scripts/PERSALYS-v14.0.1.sh b/products/compil_scripts/PERSALYS-v14.0.1.sh
index afec42f02e087dd71592cfb1abf9f462ce5c2808..a64aa951f1bc5e819547891aab5f8ab1c0eedd9b 100755 (executable)
--- a/products/compil_scripts/PERSALYS-v14.0.1.sh
+++ b/products/compil_scripts/PERSALYS-v14.0.1.sh
@@ -45,6 +45,8 @@ elif [ "$DIST_NAME$DIST_VERSION" == "FD36" ]; then
     CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" #
 elif [ "$DIST_NAME$DIST_VERSION" == "FD37" ]; then
     CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" #
+elif [ "$DIST_NAME$DIST_VERSION" == "FD38" ]; then
+    CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" #
 else
     CMAKE_OPTIONS+=" -DUSE_SPHINX=ON"
 fi

diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh
index 9ec9546d1ff5338e14d7c16b695b495a8e65d370..7fcb436233b37cbe87093e0ce11ddafad0e4dee3 100755 (executable)
--- a/products/compil_scripts/opencv.sh
+++ b/products/compil_scripts/opencv.sh
@@ -35,7 +35,7 @@ if version_ge $VERSION "3."; then
     CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC"
     LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
     case $LINUX_DISTRIBUTION in
-      FD34|FD35|FD36|FD37|UB22*)
+      FD34|FD35|FD36|FD37|FD38|UB22*)
           CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=\"-std=c++14\""
           CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14"
           ;;

diff --git a/products/compil_scripts/openturns-1.20.1.sh b/products/compil_scripts/openturns-1.20.1.sh
index e9bd98859a1faed402e7d933ebbeb8796ce97bb3..5b96c5a90534f8e84cd02b20a9bedfbd05f40ee4 100755 (executable)
--- a/products/compil_scripts/openturns-1.20.1.sh
+++ b/products/compil_scripts/openturns-1.20.1.sh
@@ -35,7 +35,7 @@ fi
 # https://github.com/persalys/persalys/issues/745
 LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
 case $LINUX_DISTRIBUTION in
-    UB22*|CO8*|CO9*|FD36|FD37)
+    UB22*|CO8*|CO9*|FD36|FD37|FD38)
         echo "WARNING: switching OFF TBB support"
         CMAKE_OPTIONS+=" -DUSE_TBB=OFF"
         ;;
@@ -410,6 +410,9 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then
             FD37)
                 SITE_PATCH=$SOURCE_DIR/addons/site-patch.py
                 ;;
+            FD38)
+                SITE_PATCH=$SOURCE_DIR/addons/site-patch.py
+                ;;
             CO8*)
                 SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py
                 ;;

diff --git a/products/medfile.pyconf b/products/medfile.pyconf
index dd2a63ab0224a8adca6f3b2f2ac59a776f5dd5d5..316001ab606ae0f1d543462324f661758f97df14 100644 (file)
--- a/products/medfile.pyconf
+++ b/products/medfile.pyconf
@@ -60,6 +60,14 @@ version_4_1_1_UB22_04 :
     patches: ['SPNS-29880-medfile.patch']
 }
 
+version_4_1_1_FD38 :
+{
+    compil_script : 'med-4.1.1.sh'
+    test_build : "make check"
+    build_depend : ['swig']
+    patches: ['SPNS-29880-medfile.patch']
+}
+
 version_4_1_1_FD37 :
 {
     compil_script : 'med-4.1.1.sh'

diff --git a/products/opencv.pyconf b/products/opencv.pyconf
index eb4ef6e889ec0cdb47b96d0df223c6e9462f8151..0ce44c5a92390cefa75fe688c091c446322f8c81 100644 (file)
--- a/products/opencv.pyconf
+++ b/products/opencv.pyconf
@@ -41,6 +41,11 @@ version_3_2_0 :
     patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "opencv-3.2.0-python2-cmake.patch"]
 }
 
+version_3_2_0_FD38 :
+{
+    patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"]
+}
+
 version_3_2_0_FD37 :
 {
     patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"]

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index 4cb1c48faf6d493896fb9cb5c0fe4c7fec41eb38..4a973ac44eefac855973cac0745f9ea9f1966046 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -104,6 +104,14 @@ version_1_20_1_CO7 :
     opt_depend : ['pandas', 'statsmodels']
 }
 
+version_1_20_1_FD38 :
+{
+    compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
+    patches : []
+    depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
+    opt_depend : ['pandas', 'statsmodels']
+}
+
 version_1_20_1_FD37 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension

diff --git a/products/root.pyconf b/products/root.pyconf
index 3cb09c820028583288c84110357abac85cfc7a56..fb2113486b4b26fe53f095cf2d0c5e3f7b6ca9e0 100644 (file)
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -97,6 +97,12 @@ version_6_22_02_FD36:
     patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch']
 }
 
+version_6_22_02_FD38:
+{
+    get_source : "archive"
+    patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch']
+}
+
 version_6_22_02_FD37:
 {
     get_source : "archive"