From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 18 Sep 2023 10:55:33 +0000 (+0200)
Subject: bos #37534:
X-Git-Tag: V9_12_0~44
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2e5c9ac41ff59b684974a382813ffff9aa5fc1a2;p=tools%2Fsat_salome.git

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 ba0f5db..094ec08 100644
--- 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 93610e9..9f804e0 100644
--- 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 e562c65..5455733 100644
--- 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 3c042a0..f5e7143 100644
--- 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