summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-11-14 20:39:42 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-11-14 20:39:42 (GMT)
commit38091f7b00e91154220465c3baa569844df75850 (patch)
tree04c0f38b48f8d9c73b105d9a858c61d2cb3088ea /doc
parent202382fe72ba66b339e2a65be53b4e8054ff5cc3 (diff)
downloadSCons-38091f7b00e91154220465c3baa569844df75850.zip
SCons-38091f7b00e91154220465c3baa569844df75850.tar.gz
SCons-38091f7b00e91154220465c3baa569844df75850.tar.bz2
Regenerated docs for 3.0.1 release.
Diffstat (limited to 'doc')
-rw-r--r--doc/generated/examples/caching_ex-random_1.xml4
-rw-r--r--doc/generated/examples/environments_ex3_1.xml22
-rw-r--r--doc/generated/examples/java_jar1_1.xml2
3 files changed, 6 insertions, 22 deletions
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 3798ec9..81cbc5d 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 f3.o -c f3.c
cc -o f5.o -c f5.c
+cc -o f4.o -c f4.c
cc -o f1.o -c f1.c
+cc -o f3.o -c f3.c
cc -o f2.o -c f2.c
-cc -o f4.o -c f4.c
cc -o prog f1.o f2.o f3.o f4.o f5.o
</screen>
diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml
index 62ecc8f..3262302 100644
--- a/doc/generated/examples/environments_ex3_1.xml
+++ b/doc/generated/examples/environments_ex3_1.xml
@@ -1,22 +1,6 @@
<?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>
-UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 547: invalid continuation byte:
- File "/home/my/project/SConstruct", line 6:
- dbg.Program('foo', 'foo.c')
- File "bootstrap/src/engine/SCons/Environment.py", line 260:
- return MethodWrapper.__call__(self, target, source, *args, **kw)
- File "bootstrap/src/engine/SCons/Environment.py", line 224:
- return self.method(*nargs, **kwargs)
- File "bootstrap/src/engine/SCons/Builder.py", line 635:
- return self._execute(env, target, source, OverrideWarner(kw), ekw)
- File "bootstrap/src/engine/SCons/Builder.py", line 541:
- source = self.src_builder_sources(env, source, overwarn)
- File "bootstrap/src/engine/SCons/Builder.py", line 748:
- tlist = bld._execute(env, None, [s], overwarn)
- File "bootstrap/src/engine/SCons/Builder.py", line 557:
- _node_errors(self, env, tlist, slist)
- File "bootstrap/src/engine/SCons/Builder.py", line 303:
- msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8'))
- File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/encodings/utf_8.py", line 16:
- return codecs.utf_8_decode(input, errors, True)
+
+scons: *** Two environments with different actions were specified for the same target: foo.o
+File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
</screen>
diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml
index daa3d1a..de93227 100644
--- a/doc/generated/examples/java_jar1_1.xml
+++ b/doc/generated/examples/java_jar1_1.xml
@@ -1,5 +1,5 @@
<?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>
javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
-scons: *** [test.jar] Source `classes.class' not found, needed by target `test.jar'.
+jar cf test.jar classes
</screen>