bos #37534:

 -  fix python path issue in original description: __SALOME_BOOTSTRAP should indeed read__SALOME_BOOTSTRAP__.
 -  support Windows

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index ba0f5db049fe7eb9959d491a912763ba6cfcab79..094ec088f27459bcbf351f7f5e6355c6722203db 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -167,6 +167,7 @@ APPLICATION :
         'YACS'
         'YACSGEN'
         'DOCUMENTATION'
+        'SALOMEBOOTSTRAP'
         'SAMPLES'
         'COMPONENT'
         'PYCALCULATOR'

diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index 93610e945730945fed3013d5704ff3cb7798b151..9f804e0849caef70e9e11f351872ee939cdf6069 100644 (file)
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -67,7 +67,7 @@ default_win :
               "sphinxcontrib_serializinghtml",
               "graphviz"
              ]
-    opt_depend : ["sphinx_rtd_theme"]
+    opt_depend : ["sphinx_rtd_theme", "SALOMEBOOTSTRAP"]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 
 }

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index e562c65e814ef2d1b230cb1fc44acedec25b1e79..5455733dbb09d64af4d9c272e8bf74573990255a 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -68,6 +68,7 @@ default_win :
               "psutil"
               ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
+    opt_depend : ["SALOMEBOOTSTRAP"]
 }
 
 default_MPI :

diff --git a/products/env_scripts/SALOMEBOOTSTRAP.py b/products/env_scripts/SALOMEBOOTSTRAP.py
index 3c042a09f7940b64d906f1cfbe16d7d5c5e83a6d..f5e7143df4c7a39aa9eeb7cc56f91593870f2f72 100644 (file)
--- a/products/env_scripts/SALOMEBOOTSTRAP.py
+++ b/products/env_scripts/SALOMEBOOTSTRAP.py
@@ -6,10 +6,7 @@ import platform
 
 def set_env(env, prereq_dir, version):
   env.set('SALOMEBOOTSTRAP_ROOT_DIR', prereq_dir)
-  if platform.system() == "Windows" :
-    pass
-  else:
-    env.prepend('PYTHONPATH', os.path.join(prereq_dir, '__SALOME_BOOTSTRAP'))
+  env.prepend('PYTHONPATH', os.path.join(prereq_dir, '__SALOME_BOOTSTRAP__'))
 
 def set_nativ_env(env):
   pass