0021308: Remove hard-coded dependency of the external mesh plugins from the SMESH module

set SMESH_MeshersList and SalomeAppConfig envirinment variables for
   plugins found by *_ROOT_DIR variables
This commit is contained in:
eap 2012-03-11 14:24:45 +00:00
parent 24bd6a0e24
commit 5113201233

View File

@ -34,23 +34,37 @@ def set_env(args):
os.environ["SALOME_StdMeshersResources"] \ os.environ["SALOME_StdMeshersResources"] \
= os.environ["SMESH_ROOT_DIR"]+"/share/"+salome_subdir+"/resources/smesh" = os.environ["SMESH_ROOT_DIR"]+"/share/"+salome_subdir+"/resources/smesh"
pass pass
if args.has_key("SMESH_plugins"):
plugin_list = [] # find plugins
for plugin in args["SMESH_plugins"]: plugin_list = []
plugin_root = "" resource_path_list = []
if os.environ.has_key(plugin+"_ROOT_DIR"): for env_var in os.environ.keys():
plugin_root = os.environ[plugin+"_ROOT_DIR"] value = os.environ[env_var]
else: if env_var[-9:] == "_ROOT_DIR" and value:
# workaround to avoid modifications of existing environment plugin_root = value
if os.environ.has_key(plugin.upper()+"_ROOT_DIR"): plugin = env_var[:-9] # plugin name may have wrong case
plugin_root = os.environ[plugin.upper()+"_ROOT_DIR"]
pass # look for NAMEOFPlugin.xml file among resource files
pass resource_dir = plugin_root+"/share/"+salome_subdir+"/resources/"+plugin.lower()
if plugin_root != "": if not os.access( resource_dir, os.F_OK ): continue
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
plugin_list.append(plugin) plugin_list.append(plugin)
if not os.environ.has_key("SALOME_"+plugin+"Resources"): if not os.environ.has_key("SALOME_"+plugin+"Resources"):
os.environ["SALOME_"+plugin+"Resources"] \ resource_path = plugin_root+"/share/"+salome_subdir+"/resources/"+plugin.lower()
= plugin_root+"/share/"+salome_subdir+"/resources/"+plugin.lower() os.environ["SALOME_"+plugin+"Resources"] = resource_path
resource_path_list.append( resource_path )
add_path(os.path.join(plugin_root,get_lib_dir(),python_version, "site-packages",salome_subdir), "PYTHONPATH") add_path(os.path.join(plugin_root,get_lib_dir(),python_version, "site-packages",salome_subdir), "PYTHONPATH")
add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir), "PYTHONPATH") add_path(os.path.join(plugin_root,get_lib_dir(),salome_subdir), "PYTHONPATH")
@ -63,7 +77,8 @@ def set_env(args):
add_path(os.path.join(plugin_root,"bin",salome_subdir), "PATH") add_path(os.path.join(plugin_root,"bin",salome_subdir), "PATH")
pass pass
pass pass
pass break
pass plugin_list.append("StdMeshers")
plugin_list.append("StdMeshers") os.environ["SMESH_MeshersList"] = ":".join(plugin_list)
os.environ["SMESH_MeshersList"] = ":".join(plugin_list) os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + ":" + ":".join(resource_path_list)