From 8d39a9f28e6d019f96dacf880fac394f2f3ae844 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 28 Mar 2012 14:37:07 +0000 Subject: [PATCH] Porting SMESH Plugins on Win32 platform. --- bin/smesh_setenv.py | 10 +++++----- src/SMESH_I/SMESH_2smeshpy.cxx | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py index 73204850f..81980703d 100644 --- a/bin/smesh_setenv.py +++ b/bin/smesh_setenv.py @@ -26,13 +26,13 @@ from setenv import add_path, get_lib_dir, salome_subdir def set_env(args): """Add to the PATH-variables modules specific paths""" - + psep = os.pathsep python_version="python%d.%d" % sys.version_info[0:2] if not os.environ.has_key("SALOME_StdMeshersResources"): os.environ["SALOME_StdMeshersResources"] \ - = os.environ["SMESH_ROOT_DIR"]+"/share/"+salome_subdir+"/resources/smesh" + = os.path.join(os.environ["SMESH_ROOT_DIR"],"share",salome_subdir,"resources","smesh") pass # find plugins @@ -45,7 +45,7 @@ def set_env(args): plugin = env_var[:-9] # plugin name may have wrong case # look for NAMEOFPlugin.xml file among resource files - resource_dir = plugin_root+"/share/"+salome_subdir+"/resources/"+plugin.lower() + resource_dir = os.path.join(plugin_root,"share",salome_subdir,"resources",plugin.lower()) 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 \ @@ -62,7 +62,7 @@ def set_env(args): # add paths of plugin plugin_list.append(plugin) if not os.environ.has_key("SALOME_"+plugin+"Resources"): - resource_path = plugin_root+"/share/"+salome_subdir+"/resources/"+plugin.lower() + resource_path = os.path.join(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") @@ -80,5 +80,5 @@ def set_env(args): break plugin_list.append("StdMeshers") os.environ["SMESH_MeshersList"] = ":".join(plugin_list) - os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + ":" + ":".join(resource_path_list) + os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list) diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 10673f511..48144a996 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -3934,7 +3934,11 @@ _pyHypothesisReader::_pyHypothesisReader() sep = rootDir[pos]; break; } +#ifdef WNT + if (sep.empty() ) sep = "\\"; +#else if (sep.empty() ) sep = "/"; +#endif // get a path to resource file string xmlPath = rootDir; -- 2.39.2