bos #18467 Remove deprecated environment variables

This commit is contained in:
vsr 2020-01-29 15:02:11 +03:00
parent e374376aa6
commit 76ead36bb3

View File

@ -18,64 +18,64 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
import os, sys """
Set-up additional environment needed for SMESH module and meshing plugins.
"""
import os
import os.path as osp
import sys
from xml.dom.minidom import parse
from setenv import add_path, get_lib_dir, salome_subdir from setenv import add_path, get_lib_dir, salome_subdir
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
def set_env(args): def set_env(args):
"""Add to the PATH-variables modules specific paths""" """Set-up additional environment needed for SMESH module and plugins"""
psep = os.pathsep py_version = 'python{}.{}'.format(*sys.version_info[:2])
python_version="python%d.%d" % sys.version_info[0:2]
# search and set-up meshing plugins
plugins = []
resource_dirs = []
for var in [i for i in os.environ if i.endswith('_ROOT_DIR') and os.environ[i]]:
plugin_root = os.environ[var]
plugin_name = var[:-9] # plugin name as extracted from environment variable
plugin_lname = plugin_name.lower() # plugin name in lowercase
if "SALOME_StdMeshersResources" not in os.environ: # look for NAMEOFPlugin.xml file among resource files
os.environ["SALOME_StdMeshersResources"] \ # resource dir must be <plugin_root>/share/salome/resources/<plugin_name_lowercase>
= os.path.join(os.environ["SMESH_ROOT_DIR"],"share",salome_subdir,"resources","smesh") resource_dir = osp.join(plugin_root, 'share', salome_subdir, 'resources', plugin_lname)
pass if not os.access(resource_dir, os.F_OK):
continue # directory does not exist or isn't accessible
# find plugins for resource_file in [i for i in os.listdir(resource_dir) \
plugin_list = ["StdMeshers"] if osp.isfile(os.path.join(resource_dir, i))]:
resource_path_list = [] # look for resource file (XML) to extract valid plugin name
for env_var in list(os.environ.keys()): if resource_file.lower() == f'{plugin_lname}.xml':
value = os.environ[env_var] try:
if env_var[-9:] == "_ROOT_DIR" and value: # get plugin name from 'resources' attribute of 'meshers-group' xml node
plugin_root = value # as name extracted from environment variable can be in wrong case
plugin = env_var[:-9] # plugin name may have wrong case xml_doc = parse(osp.join(resource_dir, resource_file))
plugin_name = xml_doc.getElementsByTagName('meshers-group')[0].getAttribute('resources')
# look for NAMEOFPlugin.xml file among resource files # add plugin to the list of available meshing plugins
resource_dir = os.path.join(plugin_root,"share",salome_subdir,"resources",plugin.lower()) plugins.append(plugin_name)
if not os.access( resource_dir, os.F_OK ): continue resource_dirs.append(resource_dir)
for resource_file in os.listdir( resource_dir ):
if not resource_file.endswith( ".xml") or \
resource_file.lower() != plugin.lower() + ".xml":
continue
# use "resources" attribute of "meshers-group" as name of plugin in a right case
from xml.dom.minidom import parse
xml_doc = parse( os.path.join( resource_dir, resource_file ))
meshers_nodes = xml_doc.getElementsByTagName("meshers-group")
if not meshers_nodes or not meshers_nodes[0].hasAttribute("resources"): continue
plugin = meshers_nodes[0].getAttribute("resources")
if plugin in plugin_list: continue
# add paths of plugin # setup environment needed for plugin
plugin_list.append(plugin) add_path(osp.join(plugin_root, 'bin', salome_subdir), 'PATH')
if "SALOME_"+plugin+"Resources" not in os.environ: add_path(osp.join(plugin_root, get_lib_dir(), salome_subdir), 'PATH' \
resource_path = os.path.join(plugin_root,"share",salome_subdir,"resources",plugin.lower()) if sys.platform == 'win32' else 'LD_LIBRARY_PATH')
os.environ["SALOME_"+plugin+"Resources"] = resource_path add_path(osp.join(plugin_root, 'bin', salome_subdir), 'PYTHONPATH')
resource_path_list.append( resource_path ) add_path(osp.join(plugin_root, get_lib_dir(), salome_subdir), 'PYTHONPATH')
add_path(os.path.join(plugin_root,get_lib_dir(),python_version, "site-packages",salome_subdir), "PYTHONPATH") add_path(osp.join(plugin_root, get_lib_dir(), py_version, 'site-packages',
add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir), "PYTHONPATH") salome_subdir), 'PYTHONPATH')
if sys.platform == "win32": break # one resource file is enough!
add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir), "PATH") except:
add_path(os.path.join(plugin_root,"bin",salome_subdir), "PYTHONPATH") continue # invalid resource valid
else:
add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir), "LD_LIBRARY_PATH") # full list of known meshers
add_path(os.path.join(plugin_root,"bin",salome_subdir), "PYTHONPATH") os.environ['SMESH_MeshersList'] = os.pathsep.join(['StdMeshers'] + plugins)
add_path(os.path.join(plugin_root,"bin",salome_subdir), "PATH") # access to resources
pass os.environ['SalomeAppConfig'] = os.pathsep.join(os.environ['SalomeAppConfig'].split(os.pathsep) + resource_dirs)
pass
break
os.environ["SMESH_MeshersList"] = os.pathsep.join(plugin_list)
os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list)