From 1110cfdb866a34580f0eb4485dbe74283d186ab8 Mon Sep 17 00:00:00 2001 From: Konstantin LEONTEV Date: Tue, 7 Mar 2023 16:01:41 +0100 Subject: [PATCH] [bos #32522][EDF] SALOME on Demand. Fixed using hardcoded separator for paths in env files. --- bin/SalomeOnDemandTK/Atomic_env.py | 2 +- bin/SalomeOnDemandTK/Base_env.py | 2 +- bin/SalomeOnDemandTK/GEOM_env.py | 2 +- bin/SalomeOnDemandTK/PYHELLO_env.py | 2 +- bin/SalomeOnDemandTK/SMESH_and_plugins_env.py | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/SalomeOnDemandTK/Atomic_env.py b/bin/SalomeOnDemandTK/Atomic_env.py index abcebdbc0..9a9d2daf7 100644 --- a/bin/SalomeOnDemandTK/Atomic_env.py +++ b/bin/SalomeOnDemandTK/Atomic_env.py @@ -28,4 +28,4 @@ def init(context, root_dir): 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=':') + context.addToVariable('SalomeAppConfig', atomic_res_dir, separator=os.pathsep) diff --git a/bin/SalomeOnDemandTK/Base_env.py b/bin/SalomeOnDemandTK/Base_env.py index 9da8c9f51..ea4a6559e 100644 --- a/bin/SalomeOnDemandTK/Base_env.py +++ b/bin/SalomeOnDemandTK/Base_env.py @@ -48,4 +48,4 @@ def init(context, root_dir): if reinitialise_paths: context.setVariable('SalomeAppConfig', gui_res_dir, overwrite=True) else: - context.addToVariable('SalomeAppConfig', gui_res_dir, separator=':') + context.addToVariable('SalomeAppConfig', gui_res_dir, separator=os.pathsep) diff --git a/bin/SalomeOnDemandTK/GEOM_env.py b/bin/SalomeOnDemandTK/GEOM_env.py index ccc6cb3ac..c83445387 100644 --- a/bin/SalomeOnDemandTK/GEOM_env.py +++ b/bin/SalomeOnDemandTK/GEOM_env.py @@ -36,7 +36,7 @@ def init(context, root_dir): context.setVariable('PARALLEL_VISU', '1', overwrite=True) geom_res_dir = os.path.join(geom_root_dir, 'share', 'salome', 'resources', 'geom') - context.addToVariable('SalomeAppConfig', geom_res_dir, separator=':') + context.addToVariable('SalomeAppConfig', geom_res_dir, separator=os.pathsep) context.setVariable('GEOM_PluginsList', 'BREPPlugin:STEPPlugin:IGESPlugin:STLPlugin:XAOPlugin:VTKPlugin:AdvancedGEOM', overwrite=True) diff --git a/bin/SalomeOnDemandTK/PYHELLO_env.py b/bin/SalomeOnDemandTK/PYHELLO_env.py index bd3f47b24..eea9b36db 100644 --- a/bin/SalomeOnDemandTK/PYHELLO_env.py +++ b/bin/SalomeOnDemandTK/PYHELLO_env.py @@ -35,4 +35,4 @@ def init(context, root_dir): context.addToVariable('SALOME_MODULES', 'PYHELLO', separator=',') pyhello_res_dir = os.path.join(pyhello_root_dir, 'share', 'salome', 'resources', 'pyhello') - context.addToVariable('SalomeAppConfig', pyhello_res_dir, separator=':') + context.addToVariable('SalomeAppConfig', pyhello_res_dir, separator=os.pathsep) diff --git a/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py b/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py index 16353f557..7b6057693 100644 --- a/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py +++ b/bin/SalomeOnDemandTK/SMESH_and_plugins_env.py @@ -37,10 +37,10 @@ def init(context, root_dir): if reinitialise_paths: context.setVariable('SMESH_MeshersList', 'StdMeshers', overwrite=True) else: - context.addToVariable('SMESH_MeshersList', 'StdMeshers', separator=':') + context.addToVariable('SMESH_MeshersList', 'StdMeshers', separator=os.pathsep) smesh_res_dir = os.path.join(smesh_root_dir, 'share', 'salome', 'resources', 'smesh') - context.addToVariable('SalomeAppConfig', smesh_res_dir, separator=':') + context.addToVariable('SalomeAppConfig', smesh_res_dir, separator=os.pathsep) #[gmsh] gmsh_root_dir = os.path.join(root_dir, 'gmsh') @@ -56,8 +56,8 @@ def init(context, root_dir): context.addToPythonPath(os.path.join(netgenplugin_root_dir, 'bin', 'salome')) context.addToPythonPath(os.path.join(netgenplugin_root_dir, 'lib', 'salome')) context.addToPythonPath(os.path.join(netgenplugin_root_dir, python_libdir, 'salome')) - context.addToVariable('SMESH_MeshersList', 'NETGENPlugin', separator=':') + context.addToVariable('SMESH_MeshersList', 'NETGENPlugin', separator=os.pathsep) netgenplugin_res_dir = os.path.join(netgenplugin_root_dir, 'share', 'salome', 'resources', 'netgenplugin') - context.addToVariable('SalomeAppConfig', netgenplugin_res_dir, separator=':') + context.addToVariable('SalomeAppConfig', netgenplugin_res_dir, separator=os.pathsep) -- 2.39.2