From cf831c8896a3a62fe5d54dfa0cd4ad6cbaeafd56 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 25 Mar 2024 10:47:01 +0100
Subject: [PATCH] spns #40729: MeshGems 2024.1 -  windows

---
 products/MeshGems.pyconf                  | 13 +++++
 products/compil_scripts/MeshGems-2024.bat | 58 +++++++++++++++++++++++
 products/env_scripts/MeshGems.py          | 12 +++--
 3 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 products/compil_scripts/MeshGems-2024.bat

diff --git a/products/MeshGems.pyconf b/products/MeshGems.pyconf
index 432e501..abd595c 100644
--- a/products/MeshGems.pyconf
+++ b/products/MeshGems.pyconf
@@ -45,6 +45,19 @@ version_2024_1 :
     }
 }
 
+version_2024_1_win :
+{
+    archive_info : {archive_name : "MeshGems-2024.1.0.0_windows.tar.gz"}
+    compil_script :  "MeshGems-2024-1.bat"
+    properties :
+    {
+      is_distene : "no"
+      licence : "libSalomeMeshGemsKeyGenerator"
+      incremental : "yes"
+      single_install_dir : "yes" # aimed to solve sat #18914
+    }
+}
+
 version_2_15_1 :
 {
     properties :
diff --git a/products/compil_scripts/MeshGems-2024.bat b/products/compil_scripts/MeshGems-2024.bat
new file mode 100644
index 0000000..755a94a
--- /dev/null
+++ b/products/compil_scripts/MeshGems-2024.bat
@@ -0,0 +1,58 @@
+@echo off
+
+echo ##########################################################################
+echo MeshGems %VERSION%
+echo ##########################################################################
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin
+if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib
+if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include
+if NOT exist "%PRODUCT_INSTALL%\Docs" mkdir %PRODUCT_INSTALL%\Docs
+
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+cd %SOURCE_DIR%
+
+set SRC_FOLDER=Win10_64_VC17
+cd Products
+
+echo PRODUCT_INSTALL = %PRODUCT_INSTALL%
+
+REM
+xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q /Y
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on copying include
+    exit 1
+)
+
+echo SRC_FOLDER = %SRC_FOLDER%
+echo. 
+echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
+xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on copying lib
+    exit 2
+)
+
+REM
+echo. 
+echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q /Y
+xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q /Y
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on copying bin
+    exit 3
+)
+
+REM
+echo.
+xcopy Docs\* %PRODUCT_INSTALL%\Docs /E /I /Q /Y
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on copying Docs
+    exit 4
+)
+
+echo.
+echo ########## END
diff --git a/products/env_scripts/MeshGems.py b/products/env_scripts/MeshGems.py
index 6f55b69..55d8fe6 100644
--- a/products/env_scripts/MeshGems.py
+++ b/products/env_scripts/MeshGems.py
@@ -69,11 +69,13 @@ def set_env(env, prereq_dir, version):
       # we don't need licence keys at compile time
       set_distene_licence(env)
   set_env_build(env, prereq_dir, version)
-  try:
-    M,m,p=map(str, version.replace('-','.').split('.'))
-  except:
-    M,m=map(str, version.replace('-','.').split('.'))
-    p="0"
+  #
+  Mmp = list(map(str, version.replace('-','.').split('.')))
+  M,m=Mmp[0:2]
+  if len(Mmp) > 2:
+    p=Mmp[2]
+  else:
+    p='0'
   env.set('MESHGEMS_VERSION', version)
   env.set('MESHGEMS_VERSION_MAJOR',M)
   env.set('MESHGEMS_VERSION_MINOR',m)
-- 
2.39.2