SConsExamples: drop bootstrap reference [ci skip]

bootstrap directory not used any longer, dropped.
One generated example (troubleshoot_stacktrace) was directly affected.
A different  generated troubleshooting example was instroduced
by an earlier change but never committed, including here
for completeness.

Signed-off-by: Mats Wichmann <mats@linux.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py
index 05bd02e..063fba1 100644
--- a/bin/SConsExamples.py
+++ b/bin/SConsExamples.py
@@ -415,15 +415,9 @@ def exampleNamesAreUnique(dpath):
 sys.path.append(os.path.join(os.getcwd(), 'testing/framework'))
 sys.path.append(os.path.join(os.getcwd(), 'build', 'testing/framework'))
 
-scons_py = os.path.join('bootstrap', 'scripts', 'scons.py')
-if not os.path.exists(scons_py):
-    scons_py = os.path.join('scripts', 'scons.py')
-
+scons_py = os.path.join('scripts', 'scons.py')
 scons_py = os.path.join(os.getcwd(), scons_py)
-
-scons_lib_dir = os.path.join(os.getcwd(), 'bootstrap', 'src', 'engine')
-if not os.path.exists(scons_lib_dir):
-    scons_lib_dir = os.path.join(os.getcwd(), 'src', 'engine')
+scons_lib_dir = os.path.join(os.getcwd(), 'src', 'engine')
 
 os.environ['SCONS_LIB_DIR'] = scons_lib_dir
 
@@ -879,7 +873,7 @@ def create_scons_output(e):
             if not command.output and lines:
                 ncontent = '\n'.join(lines)
                 ncontent = address_re.sub(r' at 0x700000>', ncontent)
-                ncontent = engine_re.sub(r' File "bootstrap/src/engine/SCons/', ncontent)
+                ncontent = engine_re.sub(r' File "src/engine/SCons/', ncontent)
                 ncontent = file_re.sub(r'\1 <module>', ncontent)
                 ncontent = nodelist_re.sub(r"\1 'NodeList' object \2", ncontent)
                 ncontent = ncontent.replace('__ROOT__', '')