update new meshgems licence management

diff --git a/products/MeshGems.pyconf b/products/MeshGems.pyconf
index 9d8f722d9b1a88580aad5bb71c6261d1eadb1ae4..5c27e998cb76de3570548021c1334729ee6a11dd 100644 (file)
--- a/products/MeshGems.pyconf
+++ b/products/MeshGems.pyconf
@@ -35,25 +35,16 @@ default_win :
     }
 }
 
-version_2_13_1 :
+from_2_13_0_to_2_99_9 :
 {
     properties :
     {
       is_distene : "no"
+      licence : "libSalomeMeshGemsKeyGenerator"
       incremental : "yes"
     }
 }
 
-version_2_13_1_win :
-{
-    properties :
-    {
-      is_distene : "no"
-      incremental : "yes"
-      single_install_dir : "yes" # aimed to solve sat #18914
-    }
-}
-
 version_2_9_6 :
 {
 }
@@ -61,4 +52,4 @@ version_2_9_6 :
 version_2_9_6_win :
 {
    archive_info : {archive_name : "MeshGems_V2.9.6_windows.tar.gz"}
-}
\ No newline at end of file
+}

diff --git a/products/env_scripts/MeshGems.py b/products/env_scripts/MeshGems.py
index f320c1485fd3292930deedd026895a07ea86f722..f5d4bc4441b291cd392f2dfe5e798f6d5bf2b79f 100644 (file)
--- a/products/env_scripts/MeshGems.py
+++ b/products/env_scripts/MeshGems.py
@@ -29,11 +29,21 @@ def set_distene_licence(env):
   return
 
 def set_DASSAULT_license(env, version):
+  try:
+    license_file_prefix = env.environ.get_value("LICENCE_FILE")
+    linux_dist = env.environ.get_value("sat_dist")
+  except Exception as e:
+    return
   env.add_comment("DASSAULT MeshGems KeyGenerator based License")
   if platform.system() == "Windows" :
-    env.set('SALOME_MG_KEYGEN_LIB_PATH', 'W:\\private\\MeshGems\\libSalomeMeshGemsKeyGenerator-' + version + '.dll')
+    license_file_name=license_file_prefix + '-' + version + '.dll'
   else:
-    env.set('SALOME_MG_KEYGEN_LIB_PATH', '/home/salome/private/MeshGems/libSalomeMeshGemsKeyGenerator-' + version + '.so')
+    license_file_name=license_file_prefix + '-' + version + '-' + linux_dist + '.so'
+
+  if not os.path.exists(license_file_name):
+     print("WARNING : DASSAULT license file %s not found!" % license_file_name) 
+
+  env.set('SALOME_MG_KEYGEN_LIB_PATH', license_file_name)
   return
 
 def set_env(env, prereq_dir, version):