From 1f3946d6ff394cd1f68828de83ab1638c81574ca Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sat, 18 Apr 2020 16:22:44 -0600 Subject: Fix one more instance of moved scons.py [ci skip] SConsExamples still using src/script Signed-off-by: Mats Wichmann --- bin/SConsExamples.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py index ff72a27..05bd02e 100644 --- a/bin/SConsExamples.py +++ b/bin/SConsExamples.py @@ -415,9 +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', 'src', 'script', 'scons.py') +scons_py = os.path.join('bootstrap', 'scripts', 'scons.py') if not os.path.exists(scons_py): - scons_py = os.path.join('src', 'script', 'scons.py') + scons_py = os.path.join('scripts', 'scons.py') scons_py = os.path.join(os.getcwd(), scons_py) @@ -748,8 +748,7 @@ def command_ls(args, c, test, values): for a in args: l.extend(ls(test.workpath('WORK', a))) return l - else: - return ls(test.workpath('WORK')) + return ls(test.workpath('WORK')) def command_sleep(args, c, test, values): time.sleep(int(args[0])) -- cgit v0.12 From e50e04cc7323da19bdfe099d7dda86dcde085919 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 19 Apr 2020 06:01:22 -0600 Subject: 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 --- bin/SConsExamples.py | 12 +++-------- .../examples/troubleshoot_stacktrace_2.xml | 11 +++++----- doc/generated/examples/troubleshoot_tree1_7.xml | 25 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 doc/generated/examples/troubleshoot_tree1_7.xml 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 ', ncontent) ncontent = nodelist_re.sub(r"\1 'NodeList' object \2", ncontent) ncontent = ncontent.replace('__ROOT__', '') diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index 70a429d..7ace0ec 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -1,13 +1,12 @@ - -% scons -Q --debug=stacktrace +% scons -Q --debug=stacktrace scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. scons: internal stack trace: - File "bootstrap/src/engine/SCons/Job.py", line 199, in start + File "src/engine/SCons/Job.py", line 199, in start task.prepare() - File "bootstrap/src/engine/SCons/Script/Main.py", line 191, in prepare + File "src/engine/SCons/Script/Main.py", line 189, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) - File "bootstrap/src/engine/SCons/Taskmaster.py", line 198, in prepare + File "src/engine/SCons/Taskmaster.py", line 196, in prepare executor.prepare() - File "bootstrap/src/engine/SCons/Executor.py", line 431, in prepare + File "src/engine/SCons/Executor.py", line 429, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) diff --git a/doc/generated/examples/troubleshoot_tree1_7.xml b/doc/generated/examples/troubleshoot_tree1_7.xml new file mode 100644 index 0000000..2b16556 --- /dev/null +++ b/doc/generated/examples/troubleshoot_tree1_7.xml @@ -0,0 +1,25 @@ +% scons -Q --tree=derived,status +cc -o f1.o -c -I. f1.c +cc -o f2.o -c -I. f2.c +cc -o f3.o -c -I. f3.c +cc -o prog f1.o f2.o f3.o + E = exists + R = exists in repository only + b = implicit builder + B = explicit builder + S = side effect + P = precious + A = always build + C = current + N = no clean + H = no cache + +[E b ]+-. +[E B C ] +-f1.o +[E B C ] +-f2.o +[E B C ] +-f3.o +[E B C ] +-prog +[E B C ] +-f1.o +[E B C ] +-f2.o +[E B C ] +-f3.o + -- cgit v0.12