Skip to content

Commit d8c76e2

Browse files
bdbaddogbdbaddog
authored
Merge pull request SCons#4571 from SCons/rel_4.8.0
Rel 4.8.0
2 parents e713077 + 8db3076 commit d8c76e2

18 files changed

+58
-64
lines changed

‎CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NOTE: Since SCons 4.3.0, Python 3.6.0 or above is required.
1010
NOTE: Python 3.6 support is deprecated and will be dropped in a future reease.
1111
python.org no longer supports 3.6 or 3.7, and will drop 3.8 in Oct. 2024.
1212

13-
RELEASE VERSION/DATE TO BE FILLED IN LATER
13+
RELEASE 4.8.0 - Sun, 07 Jul 2024 17:22:20 -0700
1414

1515
From Joseph Brill:
1616
- For msvc version specifications without an 'Exp' suffix, an express installation

‎RELEASE.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
If you are reading this in the git repository, the contents
2-
refer to *unreleased* changes since the last SCons release.
3-
Past official release announcements appear at:
4-
5-
https://scons.org/tag/releases.html
6-
7-
==================================================================
8-
9-
A new SCons release, 4.7.1, is now available on the SCons download page:
1+
A new SCons release, 4.8.0, is now available on the SCons download page:
102

113
https://scons.org/pages/download.html
124

@@ -189,4 +181,9 @@ Thanks to the following contributors listed below for their contributions to thi
189181
==========================================================================================
190182
.. code-block:: text
191183

192-
git shortlog --no-merges -ns 4.0.1..HEAD
184+
git shortlog --no-merges -ns 4.7.0..HEAD
185+
70 Mats Wichmann
186+
35 Joseph Brill
187+
26 William Deegan
188+
7 Raymond Li
189+
7 Thaddeus Crews

‎ReleaseConfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
# If the release type is not 'final', the patchlevel is set to the
3232
# release date. This value is mandatory and must be present in this file.
3333
#version_tuple = (2, 2, 0, 'final', 0)
34-
version_tuple = (4, 6, 2, 'a', 0)
34+
version_tuple = (4, 8, 0)
3535

3636
# Python versions prior to unsupported_python_version cause a fatal error
3737
# when that version is used. Python versions prior to deprecate_python_version
3838
# cause a warning to be issued (assuming it's not disabled). These values are
3939
# mandatory and must be present in the configuration file.
4040
unsupported_python_version = (3, 6, 0)
41-
deprecated_python_version = (3, 6, 0)
41+
deprecated_python_version = (3, 7, 0)
4242

4343
# If release_date is (yyyy, mm, dd, hh, mm, ss), that is used as the release
4444
# date and time. If release_date is (yyyy, mm, dd), it is used for the
@@ -50,7 +50,7 @@ deprecated_python_version = (3, 6, 0)
5050
#month_year = 'December 2012'
5151

5252
# If copyright years is not given, the release year is used as the end.
53-
copyright_years = '2001 - 2023'
53+
copyright_years = '2001 - 2024'
5454

5555
# Local Variables:
5656
# tab-width:4

‎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',

‎SCons/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
__version__="4.7.0"
1+
__version__="4.8.0"
22
__copyright__="Copyright (c) 2001 - 2024 The SCons Foundation"
33
__developer__="bdbaddog"
4-
__date__="Sun, 17 Mar 2024 17:33:54 -0700"
4+
__date__="Sun, 07 Jul 2024 16:52:07 -0700"
55
__buildsys__="M1Dog2021"
6-
__revision__="265be6883fadbb5a545612265acc919595158366"
7-
__build__="265be6883fadbb5a545612265acc919595158366"
6+
__revision__="7c688f694c644b61342670ce92977bf4a396c0d4"
7+
__build__="7c688f694c644b61342670ce92977bf4a396c0d4"
88
# make sure compatibility is always in place
99
import SCons.compat # noqa

‎SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ copyright_years = strftime('2001 - %Y')
3636
# This gets inserted into the man pages to reflect the month of release.
3737
month_year = strftime('%B %Y')
3838
project = 'scons'
39-
default_version = '4.7.1'
39+
default_version = '4.8.0'
4040
copyright = f"Copyright (c) {copyright_years} The SCons Foundation"
4141

4242
# We let the presence or absence of various utilities determine whether

‎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>

0 commit comments

Comments
 (0)