Porting SMESH Plugins on Win32 platform.

diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py
index 73204850fc7a5c9ef509b01c467d496799a44585..81980703d1d80456ffe8f4dd1ea75e73d8b16283 100644 (file)
--- 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 10673f51161f30c5f29fe881244d4b2360b19709..48144a9962bd0ab920d27c7e1bb70b5af467209a 100644 (file)
--- 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;