[bos #32522][EDF] SALOME on Demand. Updated env.py files: added content for Atomic...

diff --git a/bin/SalomeOnDemandTK/Atomic_env.py b/bin/SalomeOnDemandTK/Atomic_env.py
index 68f09395313d8dea09541c34ef3b49a01a4457c4..abcebdbc0fb42271300d3b362c388fe5c0610c58 100644 (file)
--- a/bin/SalomeOnDemandTK/Atomic_env.py
+++ b/bin/SalomeOnDemandTK/Atomic_env.py
@@ -4,3 +4,28 @@
 """
 Add a custom environment to the SALOME extension.
 """
+
+import os
+
+
+def init(context, root_dir):
+    """
+    Set an environment for an extension on start of SALOME app.
+
+    Args:
+        context - an SalomeContext object.
+        root_dir - a path to __SALOME_EXT__ directory.
+
+    Returns:
+        None.
+    """
+
+    #[ATOMIC]
+    atomic_root_dir = os.path.join(root_dir, 'ATOMIC')
+    context.setVariable('ATOMIC_ROOT_DIR', atomic_root_dir, overwrite=True)
+    context.addToPath(os.path.join(atomic_root_dir, 'bin', 'salome'))
+    context.addToLdLibraryPath(os.path.join(atomic_root_dir, 'lib', 'salome'))
+    context.addToVariable('SALOME_MODULES', 'ATOMIC', separator=',')
+
+    atomic_res_dir = os.path.join(atomic_root_dir, 'share', 'salome', 'resources', 'atomic')
+    context.addToVariable('SalomeAppConfig', atomic_res_dir, separator=':')

diff --git a/bin/SalomeOnDemandTK/Base_env.py b/bin/SalomeOnDemandTK/Base_env.py
index db19eb288c76ef57a97c81f8df312bfaff3373f9..9da8c9f51c8a0d217da776cafcc36c3e42a50f6d 100644 (file)
--- a/bin/SalomeOnDemandTK/Base_env.py
+++ b/bin/SalomeOnDemandTK/Base_env.py
@@ -6,6 +6,7 @@ Add a custom environment to the SALOME extension.
 """
 
 import os
+import sys
 
 
 def init(context, root_dir):
@@ -20,7 +21,7 @@ def init(context, root_dir):
         None.
     """
 
-    python_version = '3.10'
+    python_version = '{}.{}'.format(sys.version_info[0], sys.version_info[1])
     python_libdir = os.path.join('lib', 'python' + python_version, 'site-packages')
 
     reinitialise_paths = True

diff --git a/bin/SalomeOnDemandTK/GEOM_env.py b/bin/SalomeOnDemandTK/GEOM_env.py
index 7912bbf87f3c32f3ecd54ff1f6d3fdf8cc50cd60..ccc6cb3acb42dc1f27279dc962e04eb08921c3b1 100644 (file)
--- a/bin/SalomeOnDemandTK/GEOM_env.py
+++ b/bin/SalomeOnDemandTK/GEOM_env.py
@@ -6,6 +6,7 @@ Add a custom environment to the SALOME extension.
 """
 
 import os
+import sys
 
 
 def init(context, root_dir):
@@ -20,7 +21,7 @@ def init(context, root_dir):
         None.
     """
 
-    python_version = '3.10'
+    python_version = '{}.{}'.format(sys.version_info[0], sys.version_info[1]) 
     python_libdir = os.path.join('lib', 'python' + python_version, 'site-packages')
 
     #[GEOM]

diff --git a/bin/SalomeOnDemandTK/PYHELLO_env.py b/bin/SalomeOnDemandTK/PYHELLO_env.py
index 0fa0788136318c0db07d619d4d256d28758053a8..bd3f47b249c62314a1513c5268f4390e8fddbffd 100644 (file)
--- a/bin/SalomeOnDemandTK/PYHELLO_env.py
+++ b/bin/SalomeOnDemandTK/PYHELLO_env.py
@@ -6,6 +6,7 @@ Add a custom environment to the SALOME extension.
 """
 
 import os
+import sys
 
 
 def init(context, root_dir):
@@ -20,7 +21,7 @@ def init(context, root_dir):
         None.
     """
 
-    python_version = '3.10'
+    python_version = '{}.{}'.format(sys.version_info[0], sys.version_info[1]) 
     python_libdir = os.path.join('lib', 'python' + python_version, 'site-packages')
 
     #[PYHELLO]

diff --git a/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py b/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py
index 10cde6887b37ab1cff9a89fee10aed2eeda1ab52..16353f557541d38ed50623b537ad01c1ffe55ffa 100644 (file)
--- a/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py
+++ b/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py
@@ -6,6 +6,7 @@ Add a custom environment to the SALOME extension.
 """
 
 import os
+import sys
 
 
 def init(context, root_dir):
@@ -20,7 +21,7 @@ def init(context, root_dir):
         None.
     """
 
-    python_version = '3.10'
+    python_version = '{}.{}'.format(sys.version_info[0], sys.version_info[1])
     python_libdir = os.path.join('lib', 'python' + python_version, 'site-packages')
 
     reinitialise_paths = True