From: Christophe Bourcier <christophe.bourcier@cea.fr>
Date: Wed, 19 Apr 2023 12:34:40 +0000 (+0200)
Subject: Improve new MG license mechanism to be binary compatible 2.14/2.15
X-Git-Tag: V9_11_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fcbr%2Fnew_mg_license_215_v2;p=plugins%2Fblsurfplugin.git

Improve new MG license mechanism to be binary compatible 2.14/2.15
---

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 0036e13..711e5e7 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -100,9 +100,6 @@ extern "C"{
 #include <memory>
 #include <functional>
 
-#define MESHGEMS_VERSION_HEX (MESHGEMS_VERSION_MAJOR << 16 | MESHGEMS_VERSION_MINOR << 8 | MESHGEMS_VERSION_PATCH)
-#define MESHGEMS_215 (2 << 16 | 15 << 8 | 0)
-
 using namespace std;
 
 /* ==================================
@@ -2535,19 +2532,8 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh&         aMesh,
     // set_param(css, "max_size",             val_to_string( minFaceSize * 5 ).c_str());
   }
   std::string errorTxt;
-#if MESHGEMS_VERSION_HEX > MESHGEMS_215
-  MESSAGE("MeshGems > 2.15.0");
-  MESSAGE("=> unlock CADSurf with SPATIAL_LICENSE key");
-  std::string SPATIAL_LICENSE = SMESHUtils_MGLicenseKeyGen::GetKey(errorTxt);
-  status = meshgems_cadsurf_unlock_product(SPATIAL_LICENSE.c_str());
-  if STATUS_IS_ERROR( status )
-    return error( status, "Problem with SPATIAL_LICENSE to unlock CADSurf: " + errorTxt);
-#else
-  MESSAGE("MeshGems < 2.15.0");
-  MESSAGE("=> Sign the CAD with its info");
   if ( !SMESHUtils_MGLicenseKeyGen::SignCAD( c, errorTxt ))
     return error( "Problem with library SalomeMeshGemsKeyGenerator: " + errorTxt );
-#endif
 
   // Use the original dcad
   cadsurf_set_dcad(css, dcad);
@@ -3094,19 +3080,9 @@ bool BLSURFPlugin_BLSURF::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelpe
   }
 
   std::string errorTxt;
-#if MESHGEMS_VERSION_HEX > MESHGEMS_215
-  MESSAGE("MeshGems > 2.15.0");
-  MESSAGE("=> unlock CADSurf discrete with SPATIAL_LICENSE key");
-  std::string SPATIAL_LICENSE = SMESHUtils_MGLicenseKeyGen::GetKey(errorTxt);
-  ret = meshgems_cadsurf_unlock_product(SPATIAL_LICENSE.c_str());
-  if STATUS_IS_ERROR( ret )
-    return error( ret, "Problem with SPATIAL_LICENSE to unlock CADSurf discrete: " + errorTxt);
-#else
-  MESSAGE("MeshGems < 2.15.0");
-  MESSAGE("=> Sign the mesh with its info");
-  if ( !SMESHUtils_MGLicenseKeyGen::SignMesh( msh, errorTxt ))
+
+  if ( !SMESHUtils_MGLicenseKeyGen::SignMesh( msh, "cadsurf", errorTxt ))
     return error( "Problem with library SalomeMeshGemsKeyGenerator: " + errorTxt );
-#endif
 
   ret = cadsurf_set_mesh(css, msh);
   if ( ret != STATUS_OK ) return error("Pb in cadsurf_set_mesh()");