Skip to content

Commit da8aead

Browse files
bdbaddogbdbaddog
committed
Updates for SCons 4.8.0 release
1 parent e713077 commit da8aead

13 files changed

+42
-45
lines changed

‎SCons/Script/Main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
minimum_python_version = (3, 6, 0)
7070
deprecated_python_version = (3, 7, 0) # the first non-deprecated version
7171

72-
# ordered list of SConsctruct names to look for if there is no -f flag
72+
# ordered list of SConstruct names to look for if there is no -f flag
7373
KNOWN_SCONSTRUCT_NAMES = [
7474
'SConstruct',
7575
'Sconstruct',

‎doc/generated/examples/caching_ex-random_1.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<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>
2-
cc -o f3.o -c f3.c
3-
cc -o f5.o -c f5.c
42
cc -o f4.o -c f4.c
3+
cc -o f5.o -c f5.c
54
cc -o f1.o -c f1.c
65
cc -o f2.o -c f2.c
6+
cc -o f3.o -c f3.c
77
cc -o prog f1.o f2.o f3.o f4.o f5.o
88
</screen>

‎doc/generated/examples/commandline_BoolVariable_5.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<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 RELEASE=bad_value foo.o</userinput>
22

3-
scons: *** Error converting option: RELEASE
4-
Invalid value for boolean option: bad_value
3+
scons: *** Error converting option: 'RELEASE'
4+
Invalid value for boolean variable: 'bad_value'
55
File "/home/my/project/SConstruct", line 3, in &lt;module&gt;
66
</screen>

‎doc/generated/examples/commandline_EnumVariable_2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<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 COLOR=magenta foo.o</userinput>
22

3-
scons: *** Invalid value for option COLOR: magenta. Valid values are: ('red', 'green', 'blue')
3+
scons: *** Invalid value for enum variable 'COLOR': 'magenta'. Valid values are: ('red', 'green', 'blue')
44
File "/home/my/project/SConstruct", line 10, in &lt;module&gt;
55
</screen>

‎doc/generated/examples/commandline_EnumVariable_4.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<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 COLOR=Red foo.o</userinput>
22

3-
scons: *** Invalid value for option COLOR: Red. Valid values are: ('red', 'green', 'blue')
3+
scons: *** Invalid value for enum variable 'COLOR': 'Red'. Valid values are: ('red', 'green', 'blue')
44
File "/home/my/project/SConstruct", line 10, in &lt;module&gt;
55
% <userinput>scons -Q COLOR=BLUE foo.o</userinput>
66

7-
scons: *** Invalid value for option COLOR: BLUE. Valid values are: ('red', 'green', 'blue')
7+
scons: *** Invalid value for enum variable 'COLOR': 'BLUE'. Valid values are: ('red', 'green', 'blue')
88
File "/home/my/project/SConstruct", line 10, in &lt;module&gt;
99
% <userinput>scons -Q COLOR=nAvY foo.o</userinput>
1010

11-
scons: *** Invalid value for option COLOR: nAvY. Valid values are: ('red', 'green', 'blue')
11+
scons: *** Invalid value for enum variable 'COLOR': 'nAvY'. Valid values are: ('red', 'green', 'blue')
1212
File "/home/my/project/SConstruct", line 10, in &lt;module&gt;
1313
</screen>

‎doc/generated/examples/commandline_ListVariable_3.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<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 COLORS=magenta foo.o</userinput>
22

3-
scons: *** Error converting option: COLORS
4-
Invalid value(s) for option: magenta
3+
scons: *** Invalid value(s) for variable 'COLORS': 'magenta'. Valid values are: blue,green,red,all,none
54
File "/home/my/project/SConstruct", line 7, in &lt;module&gt;
65
</screen>

‎doc/generated/examples/commandline_ListVariable_4.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<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 foo.o</userinput>
22

3-
scons: *** Error converting option: COLORS
4-
Invalid value(s) for option: 0
3+
scons: *** Invalid value(s) for variable 'COLORS': '0'. Valid values are: blue,green,red,all,none
54
File "/home/my/project/SConstruct", line 7, in &lt;module&gt;
65
</screen>

‎doc/generated/examples/commandline_PathVariable_2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<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 CONFIG=/does/not/exist foo.o</userinput>
22

3-
scons: *** Path for option CONFIG does not exist: /does/not/exist
3+
scons: *** Path for variable 'CONFIG' does not exist: /does/not/exist
44
File "/home/my/project/SConstruct", line 7, in &lt;module&gt;
55
</screen>

‎doc/generated/examples/troubleshoot_Dump_1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ scons: Reading SConscript files ...
6262
'TEMPFILEARGESCFUNC': &lt;function quote_spaces at 0x700000&gt;,
6363
'TEMPFILEARGJOIN': ' ',
6464
'TEMPFILEPREFIX': '@',
65-
'TOOLS': ['install', 'install'],
65+
'TOOLS': ['install'],
6666
'_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__, '
6767
'TARGET, SOURCE)}',
6868
'_CPPINCFLAGS': '${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, '

‎doc/generated/examples/troubleshoot_Dump_2.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ scons: Reading SConscript files ...
106106
'TEMPFILEARGESCFUNC': &lt;function quote_spaces at 0x700000&gt;,
107107
'TEMPFILEARGJOIN': '\n',
108108
'TEMPFILEPREFIX': '@',
109-
'TOOLS': ['msvc', 'install', 'install'],
110-
'VSWHERE': None,
109+
'TOOLS': ['msvc', 'install'],
111110
'_CCCOMCOM': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $CCPCHFLAGS $CCPDBFLAGS',
112111
'_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__, '
113112
'TARGET, SOURCE)}',

0 commit comments

Comments
 (0)