From 936987e14223d62bf12e3e7967b42463fa059541 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 30 Sep 2022 13:52:22 +0200
Subject: [PATCH] bos #32376: LIBBATCH and spns #32364: PlaneGCS 0.20

---
 applications/SALOME-master-MPI.pyconf     |  2 +-
 applications/SALOME-master-native.pyconf  |  4 +--
 applications/SALOME-master-windows.pyconf |  2 +-
 applications/SALOME-master.pyconf         |  4 +--
 products/LIBBATCH.pyconf                  | 10 ++++++
 products/planegcs.pyconf                  | 39 +++++++++++++----------
 6 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index f345f73..60ef5cd 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -100,7 +100,7 @@ APPLICATION :
         PERSALYS: 'v12.0'
         petsc : {tag : '3.16.0', hpc: 'yes'}
         Pillow : '7.1.1'
-        planegcs : '0.18-3cb6890'
+        planegcs : '0.20'
         psutil : '5.7.2'
         PyFMI : '2.5'
         Pygments : '2.0.2'
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 66d418e..07fdd88 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -98,7 +98,7 @@ APPLICATION :
         PERSALYS: 'v12.0'
         petsc : {tag : '3.16.0', section: 'version_3_16_0'}
         Pillow : 'native'
-        planegcs : '0.18-3cb6890'
+        planegcs : '0.20'
         psutil : 'native'
         PyFMI : '2.5'
         Pygments : 'native'
@@ -139,7 +139,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_5'}
+        'LIBBATCH' : {tag : 'V2_4_6'}
         '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 f94c9ee..8cdd538 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -138,7 +138,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_5'}
+        'LIBBATCH' : {tag :'V2_4_6'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 4e04905..b3b3e3a 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -101,7 +101,7 @@ APPLICATION :
         PERSALYS: 'v12.0'
         petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
         Pillow : '7.1.1'
-        planegcs : '0.18-3cb6890'
+        planegcs : '0.20'
         psutil : '5.7.2'
         PyFMI : '2.5'
         Pygments : '2.0.2'
@@ -141,7 +141,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : 'V2_4_5'
+        'LIBBATCH' : 'V2_4_6'
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
diff --git a/products/LIBBATCH.pyconf b/products/LIBBATCH.pyconf
index c574525..d50b246 100755
--- a/products/LIBBATCH.pyconf
+++ b/products/LIBBATCH.pyconf
@@ -30,6 +30,16 @@ default_win :
     depend : [ "Python", "pthreads" ]
 }
 
+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"
+}
+
+version_V2_4_6_win:
+{
+    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
+}
+
 version_V2_4_5:
 {
     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"
diff --git a/products/planegcs.pyconf b/products/planegcs.pyconf
index 08457c5..b267bff 100644
--- a/products/planegcs.pyconf
+++ b/products/planegcs.pyconf
@@ -1,21 +1,26 @@
 default :
 {
-    name : "planegcs"
-    build_source : "script"
-    compil_script :  $name + $VARS.scriptExtension
-    get_source : "archive"
-    environ :
-    {
-       env_script : $name + ".py"
-    }
-    depend : ['eigen','boost']
-    build_depend : ["cmake"]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    install_dir : 'base'
-    properties:
-    {
-      incremental : "yes"
-    }
+  name : "planegcs"
+  build_source : "script"
+  compil_script :  $name + $VARS.scriptExtension
+  get_source : "archive"
+  environ :
+  {
+     env_script : $name + ".py"
+  }
+  depend : ['eigen','boost']
+  build_depend : ["cmake"]
+  source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+  build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+  install_dir : 'base'
+  properties:
+  {
+    incremental : "yes"
+  }
+  patches: []
 }
 
+version_0_20 :
+{
+  patches: ['planegcs-0.20.p01.patch', 'planegcs-0.20.p02.patch']
+}
\ No newline at end of file
-- 
2.39.2