diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
| commit | 6a37189174372c9c98c63ada58ab4352adf650e8 (patch) | |
| tree | 521ddb1071569fa90100e11d7f03af13d5689aaf /doc/generated/examples | |
| parent | 14924bcc1713c5bd7dcf4db5b420204407048889 (diff) | |
| parent | 3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff) | |
| download | SCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2 | |
Commit resolved conflicted merge.
Diffstat (limited to 'doc/generated/examples')
| -rw-r--r-- | doc/generated/examples/caching_ex-random_1.xml | 4 | ||||
| -rw-r--r-- | doc/generated/examples/troubleshoot_explain1_3.xml | 2 | ||||
| -rw-r--r-- | doc/generated/examples/troubleshoot_stacktrace_2.xml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index cb14259..232e96f 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput> -cc -o f1.o -c f1.c cc -o f4.o -c f4.c +cc -o f2.o -c f2.c +cc -o f1.o -c f1.c cc -o f5.o -c f5.c cc -o f3.o -c f3.c -cc -o f2.o -c f2.c cc -o prog f1.o f2.o f3.o f4.o f5.o </screen> diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index 7e495ea..3d8592d 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -3,5 +3,5 @@ cp file.in file.oout scons: warning: Cannot find target file.out after building -File "/home/ghost/projects/scons/bootstrap/src/script/scons.py", line 199, in <module> +File "/scons/as_scons/bootstrap/src/script/scons.py", line 199, in <module> </screen> diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index 1de0dcf..add59ff 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -4,10 +4,10 @@ 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 task.prepare() - File "bootstrap/src/engine/SCons/Script/Main.py", line 164, in prepare + File "bootstrap/src/engine/SCons/Script/Main.py", line 173, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) File "bootstrap/src/engine/SCons/Taskmaster.py", line 191, in prepare executor.prepare() - File "bootstrap/src/engine/SCons/Executor.py", line 427, in prepare + File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) </screen> |