[bos #32522][EDF] SALOME on Demand. Fixed using hardcoded separator for paths in...

diff --git a/bin/SalomeOnDemandTK/Atomic_env.py b/bin/SalomeOnDemandTK/Atomic_env.py
index abcebdbc0fb42271300d3b362c388fe5c0610c58..9a9d2daf7724ecbf14b295a8bb49b4f181523504 100644 (file)
--- 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 9da8c9f51c8a0d217da776cafcc36c3e42a50f6d..ea4a6559ebebea0ee19791a4d7cba26ca13a9fdb 100644 (file)
--- 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 ccc6cb3acb42dc1f27279dc962e04eb08921c3b1..c8344538740d01ef4f818da7805c2cf9a3176a1e 100644 (file)
--- 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 bd3f47b249c62314a1513c5268f4390e8fddbffd..eea9b36dbfafe36d8f959c763ff8a0d00fd1cef4 100644 (file)
--- 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 16353f557541d38ed50623b537ad01c1ffe55ffa..7b6057693708cb2f7e56202aef13282a235a6c94 100644 (file)
--- 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)