Merge branch 'V9_9_BR'

[modules/smesh.git] / src / SMESHUtils / SMESH_MGLicenseKeyGen.cxx

diff --git a/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx b/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx
index ec06d988548ae0d1a1a1010a6e161dda1fc55e62..c86bad807ba73776683187f5556b06212642e422 100644 (file)
--- a/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx
+++ b/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,10 +29,10 @@
 #include <Basics_DirUtils.hxx>
 #include <Basics_Utils.hxx>
 
-#include <regex>
 #include <cstdlib> // getenv, system
 
 #include <boost/filesystem.hpp>
+#include <boost/regex.hpp>
 namespace boofs = boost::filesystem;
 
 #ifdef WIN32
@@ -60,6 +60,8 @@ namespace boofs = boost::filesystem;
 #undef SMESH_CAUGHT
 #define SMESH_CAUGHT error =
 
+constexpr char MESHGEMS_OLD_STYLE[] = "MESHGEMS_OLD_STYLE";
+
 
 namespace
 {
@@ -203,12 +205,12 @@ namespace
   {
     {// round1
       enum { SCHEME = 2, AUTHORITY = 4, PATH = 5 }; // sub-strings
-      std::regex urlRegex ( R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)",
-                            std::regex::extended );
-      std::smatch matchResult;
+      boost::regex urlRegex ( R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)",
+                              boost::regex::extended );
+      boost::smatch matchResult;
 
       libraryFile._isURL = false;
-      if ( std::regex_match( libraryFile._name, matchResult, urlRegex ))
+      if ( boost::regex_match( libraryFile._name, matchResult, urlRegex ))
         libraryFile._isURL = ( !matchResult.str( SCHEME    ).empty() &&
                               !matchResult.str( AUTHORITY ).empty() &&
                               !matchResult.str( PATH      ).empty() );
@@ -217,12 +219,12 @@ namespace
       return true;
     {// round2
       enum { HOST = 2, PORT = 3, PATH = 4 }; // sub-strings
-      std::regex urlRegex ( R"(^(([^:\/?#]+):)?([^/]+)?(/[^#]*))",
-                            std::regex::extended );
-      std::smatch matchResult;
+      boost::regex urlRegex ( R"(^(([^:\/?#]+):)?([^/]+)?(/[^#]*))",
+                              boost::regex::extended );
+      boost::smatch matchResult;
 
       libraryFile._isURL = false;
-      if ( std::regex_match( libraryFile._name, matchResult, urlRegex ))
+      if ( boost::regex_match( libraryFile._name, matchResult, urlRegex ))
         libraryFile._isURL = ( !matchResult.str( HOST ).empty() &&
                               !matchResult.str( PORT ).empty() &&
                               !matchResult.str( PATH ).empty() );
@@ -372,7 +374,7 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
    */
   //================================================================================
 
-  bool SignCAD( void* meshgems_cad, std::string& error )
+  bool SignCAD_After( void* meshgems_cad, std::string& error )
   {
     LibraryFile libraryFile;
     if ( !loadLibrary( error, libraryFile ))
@@ -401,6 +403,15 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
     }
     return ok;
   }
+  
+  bool SignCAD( void* meshgems_cad, std::string& error )
+  {
+    const char *meshGemsOldStyleEnvVar( getenv( MESHGEMS_OLD_STYLE ) );
+    if ( !meshGemsOldStyleEnvVar || strlen(meshGemsOldStyleEnvVar) == 0 )
+      return SignCAD_After(meshgems_cad, error);
+    else
+      return true;
+  }
 
   //================================================================================
   /*!
@@ -411,7 +422,7 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
    */
   //================================================================================
 
-  bool SignMesh( void* meshgems_mesh, std::string& error )
+  bool SignMesh_After( void* meshgems_mesh, std::string& error )
   {
     LibraryFile libraryFile;
     if ( !loadLibrary( error, libraryFile ))
@@ -440,6 +451,15 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
     }
     return ok;
   }
+  
+  bool SignMesh( void* meshgems_mesh, std::string& error )
+  {
+    const char *meshGemsOldStyleEnvVar( getenv( MESHGEMS_OLD_STYLE ) );
+    if ( !meshGemsOldStyleEnvVar || strlen(meshGemsOldStyleEnvVar) == 0 )
+      return SignMesh_After(meshgems_mesh, error);
+    else
+      return true;
+  }
 
   //================================================================================
   /*!
@@ -451,12 +471,12 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
    */
   //================================================================================
 
-  std::string GetKey(const std::string& gmfFile,
-                     int                nbVertex,
-                     int                nbEdge,
-                     int                nbFace,
-                     int                nbVol,
-                     std::string&       error)
+  std::string GetKey_After(const std::string& gmfFile,
+                            int                nbVertex,
+                            int                nbEdge,
+                            int                nbFace,
+                            int                nbVol,
+                            std::string&       error)
   {
     std::string key;
     LibraryFile libraryFile;
@@ -480,6 +500,20 @@ namespace SMESHUtils_MGLicenseKeyGen // API implementation
     return key;
   }
 
+  std::string GetKey(const std::string& gmfFile,
+                    int                nbVertex,
+                    int                nbEdge,
+                    int                nbFace,
+                    int                nbVol,
+                    std::string&       error)
+  {
+    const char *meshGemsOldStyleEnvVar( getenv( MESHGEMS_OLD_STYLE ) );
+    if ( !meshGemsOldStyleEnvVar || strlen(meshGemsOldStyleEnvVar) == 0 )
+      return GetKey_After(gmfFile,nbVertex,nbEdge,nbFace,nbVol,error);
+    else
+      return std::string("0");
+  }
+
   //================================================================================
   /*!
    * \brief Return false if libMeshGemsKeyGenerator.so is not functional