From 51f79da9cefcc117228d89339b92387d8adb154a Mon Sep 17 00:00:00 2001 From: kosta Date: Thu, 2 Mar 2023 14:25:06 +0100 Subject: [PATCH] [bos #32522][EDF] SALOME on Demand. Updated env.py files: added content for Atomic, hardcoded python version replaced to detected from the system. --- bin/SalomeOnDemandTK/Atomic_env.py | 25 +++++++++++++++++++ bin/SalomeOnDemandTK/Base_env.py | 3 ++- bin/SalomeOnDemandTK/GEOM_env.py | 3 ++- bin/SalomeOnDemandTK/PYHELLO_env.py | 3 ++- bin/SalomeOnDemandTK/SMESH_and_plugins_env.py | 3 ++- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/bin/SalomeOnDemandTK/Atomic_env.py b/bin/SalomeOnDemandTK/Atomic_env.py index 68f093953..abcebdbc0 100644 --- 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 db19eb288..9da8c9f51 100644 --- 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 7912bbf87..ccc6cb3ac 100644 --- 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 0fa078813..bd3f47b24 100644 --- 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 10cde6887..16353f557 100644 --- 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 -- 2.39.2