From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 28 Sep 2023 10:36:07 +0000 (+0200)
Subject: bos #37834: move to Libbatch 2_5_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4a174bd5f07513cbcfb148b655b23e7dcf5773c8;p=tools%2Fsat_salome.git

bos #37834: move to Libbatch 2_5_0
---

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index b62cf80..593b3b0 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -93,7 +93,7 @@ APPLICATION :
         omniORBpy : '4.2.5'
         opencv : '3.2.0'
         openmpi : '3.1.6' # current version of hdf5 is not compatible with openmpi 4, if compiled with MPI support
-        openturns:  {tag : '1.20.1', hpc : 'yes'}
+        openturns:  {tag : '1.21', hpc : 'yes'}
         openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
@@ -101,7 +101,7 @@ APPLICATION :
         pandas : '0.25.2'
         patsy : '0.5.2'
         ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
-        PERSALYS: 'v14.0.1'
+        PERSALYS: 'v14.1'
         petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
         Pillow : '8.4.0'
         planegcs : '0.18-3cb6890'
@@ -146,7 +146,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : 'V2_4_6'
+        'LIBBATCH' : 'V2_5_0'
         'KERNEL'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'}
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'}
         'GUI' : {verbose : 'yes'}
diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index 7b3742c..4854f80 100644
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -92,7 +92,7 @@ APPLICATION :
         omniORBpy : '4.2.5'
         opencv : '3.2.0'
         openmpi : '4.0.3'
-        openturns: '1.20.1'
+        openturns: '1.21'
         openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
@@ -100,7 +100,7 @@ APPLICATION :
         pandas : '0.25.2'
         patsy : '0.5.2'
         ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
-        PERSALYS: 'v14.0.1'
+        PERSALYS: 'v14.1'
         petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
         Pillow : '8.4.0'
         planegcs : '0.18-3cb6890'
@@ -145,7 +145,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : 'V2_4_6'
+        'LIBBATCH' : 'V2_5_0'
         'KERNEL'      : {tag:'master', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' }
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'}
         'GUI'
@@ -222,18 +222,18 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
-        'APPLICATION.products.openturns'  : {tag: '1.20.1',  base: 'no', section: 'version_1_20_1_CO7' }
+        'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO7' }
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
         'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
-        'APPLICATION.products.openturns': {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO8' }
+        'APPLICATION.products.openturns': {tag: '1.21',   base: 'no', section: 'version_1_21_CO8'                  }
     }
     {
         __condition__ : "VARS.dist in ['DB09']"
-        'APPLICATION.products.openturns'        : {tag: '1.20.1',  base: 'no', section: 'version_1_20_1_DB09' }
+        'APPLICATION.products.openturns'        : {tag: '1.21',  base: 'no', section: 'version_1_21_DB09' }
     }
     {
         __condition__ : "VARS.dist in ['DB10']"
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index b050f36..65cb6ce 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -143,7 +143,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : 'V2_4_6'
+        'LIBBATCH' : 'V2_5_0'
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index aa6557a..121dc99 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -146,7 +146,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_6'}
+        'LIBBATCH' : {tag :'V2_5_0'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 021514d..7561dee 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -147,7 +147,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : 'V2_4_6'
+        'LIBBATCH' : 'V2_5_0'
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
diff --git a/products/LIBBATCH.pyconf b/products/LIBBATCH.pyconf
index 57120e2..89da315 100755
--- a/products/LIBBATCH.pyconf
+++ b/products/LIBBATCH.pyconf
@@ -30,6 +30,22 @@ default_win :
     depend : [ "Python", "pthreads" ]
 }
 
+
+version_V2_5_0:
+{
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DLIBBATCH_CXX_STANDARD=17 -DLIBBATCH_MKDIR_COMMAND=/bin/mkdir -DLIBBATCH_CP_COMMAND=/bin/cp -DLIBBATCH_SH_COMMAND=/bin/sh"
+}
+
+version_V2_5_0_win:
+{
+    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
+    properties:
+    {
+        incremental : 'yes'
+        single_install_dir: 'yes' # aimed to solve sat #18914
+    }
+}
+
 version_V2_4_6:
 {
     cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DLIBBATCH_CXX_STANDARD=17 -DLIBBATCH_MKDIR_COMMAND=/bin/mkdir -DLIBBATCH_CP_COMMAND=/bin/cp -DLIBBATCH_SH_COMMAND=/bin/sh"