Skip to content

Commit e8943fd

Browse files
bdbaddogbdbaddog
authored
Merge pull request SCons#4592 from SCons/rel_4.8.1
Rel 4.8.1
2 parents b6c11d1 + ff783e7 commit e8943fd

File tree

9 files changed

+137
-125
lines changed

9 files changed

+137
-125
lines changed

‎CHANGES.txt

Lines changed: 1 addition & 3 deletions
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 release.
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.1 - Tue, 03 Sep 2024 17:22:20 -0700
1414

1515
From Thaddeus Crews:
1616
- Add explicit return types to sctypes `is_*` functions. For Python <=3.9,
@@ -51,8 +51,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
5151
a space character (issue #4585).
5252

5353

54-
55-
5654
RELEASE 4.8.0 - Sun, 07 Jul 2024 17:22:20 -0700
5755

5856
From Joseph Brill:

‎RELEASE.txt

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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-
==================================================================
81

92
A new SCons release, 4.8.1, is now available on the SCons download page:
103

@@ -13,15 +6,6 @@ A new SCons release, 4.8.1, is now available on the SCons download page:
136

147
Here is a summary of the changes since 4.8.0:
158

16-
NEW FUNCTIONALITY
17-
-----------------
18-
19-
- List new features (presumably why a checkpoint is being released)
20-
21-
DEPRECATED FUNCTIONALITY
22-
------------------------
23-
24-
- List anything that's been deprecated since the last release
259

2610
CHANGED/ENHANCED EXISTING FUNCTIONALITY
2711
---------------------------------------
@@ -60,17 +44,6 @@ FIXES
6044
This has been changed to always use the `oem` encoding which should be the
6145
encoding in the shell where the command was spawned.
6246

63-
IMPROVEMENTS
64-
------------
65-
66-
- List improvements that wouldn't be visible to the user in the
67-
documentation: performance improvements (describe the circumstances
68-
under which they would be observed), or major code cleanups
69-
70-
PACKAGING
71-
---------
72-
73-
- List changes in the way SCons is packaged and/or released
7447

7548
DOCUMENTATION
7649
-------------
@@ -93,4 +66,10 @@ Thanks to the following contributors listed below for their contributions to thi
9366
==========================================================================================
9467
.. code-block:: text
9568

96-
git shortlog --no-merges -ns 4.0.1..HEAD
69+
git shortlog --no-merges -ns 4.8.0..HEAD
70+
71+
9 Mats Wichmann
72+
8 William Deegan
73+
1 SIEGRIST Anthony
74+
1 Thaddeus Crews
75+
1 siegria

‎ReleaseConfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
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, 9, 0, 'a', 0)
34+
version_tuple = (4, 8.1)
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

‎SCons/__init__.py

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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 f1.o -c f1.c
23
cc -o f4.o -c f4.c
34
cc -o f5.o -c f5.c
4-
cc -o f1.o -c f1.c
55
cc -o f2.o -c f2.c
66
cc -o f3.o -c f3.c
77
cc -o prog f1.o f2.o f3.o f4.o f5.o

‎doc/generated/examples/troubleshoot_Dump_ENV_1.xml

Lines changed: 1 addition & 1 deletion
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</userinput>
22
scons: Reading SConscript files ...
3-
{'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin'}
3+
{'ENV': {'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin'}}
44
scons: done reading SConscript files.
55
scons: Building targets ...
66
scons: `.' is up to date.

‎doc/generated/examples/troubleshoot_Dump_ENV_2.xml

Lines changed: 3 additions & 3 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">C:\&gt;<userinput>scons</userinput>
22
scons: Reading SConscript files ...
3-
{ 'PATH': 'C:\\WINDOWS\\System32:/usr/bin',
4-
'PATHEXT': '.COM;.EXE;.BAT;.CMD',
5-
'SystemRoot': 'C:\\WINDOWS'}
3+
{ 'ENV': { 'PATH': 'C:\\WINDOWS\\System32:/usr/bin',
4+
'PATHEXT': '.COM;.EXE;.BAT;.CMD',
5+
'SystemRoot': 'C:\\WINDOWS'}}
66
scons: done reading SConscript files.
77
scons: Building targets ...
88
scons: `.' is up to date.

‎doc/generated/examples/troubleshoot_taskmastertrace_1.xml

Lines changed: 25 additions & 25 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 --taskmastertrace=- prog</userinput>
2-
Job.NewParallel._work(): [Thread:8645271808] Gained exclusive access
3-
Job.NewParallel._work(): [Thread:8645271808] Starting search
4-
Job.NewParallel._work(): [Thread:8645271808] Found 0 completed tasks to process
5-
Job.NewParallel._work(): [Thread:8645271808] Searching for new tasks
2+
Job.NewParallel._work(): [Thread:8682049344] Gained exclusive access
3+
Job.NewParallel._work(): [Thread:8682049344] Starting search
4+
Job.NewParallel._work(): [Thread:8682049344] Found 0 completed tasks to process
5+
Job.NewParallel._work(): [Thread:8682049344] Searching for new tasks
66

77
Taskmaster: Looking for a node to evaluate
88
Taskmaster: Considering node &lt;no_state 0 'prog'&gt; and its children:
@@ -18,25 +18,25 @@ Taskmaster: Evaluating &lt;pending 0 'prog.c'&gt;
1818

1919
Task.make_ready_current(): node &lt;pending 0 'prog.c'&gt;
2020
Task.prepare(): node &lt;up_to_date 0 'prog.c'&gt;
21-
Job.NewParallel._work(): [Thread:8645271808] Found internal task
21+
Job.NewParallel._work(): [Thread:8682049344] Found internal task
2222
Task.executed_with_callbacks(): node &lt;up_to_date 0 'prog.c'&gt;
2323
Task.postprocess(): node &lt;up_to_date 0 'prog.c'&gt;
2424
Task.postprocess(): removing &lt;up_to_date 0 'prog.c'&gt;
2525
Task.postprocess(): adjusted parent ref count &lt;pending 1 'prog.o'&gt;
26-
Job.NewParallel._work(): [Thread:8645271808] Searching for new tasks
26+
Job.NewParallel._work(): [Thread:8682049344] Searching for new tasks
2727

2828
Taskmaster: Looking for a node to evaluate
2929
Taskmaster: Considering node &lt;no_state 0 'inc.h'&gt; and its children:
3030
Taskmaster: Evaluating &lt;pending 0 'inc.h'&gt;
3131

3232
Task.make_ready_current(): node &lt;pending 0 'inc.h'&gt;
3333
Task.prepare(): node &lt;up_to_date 0 'inc.h'&gt;
34-
Job.NewParallel._work(): [Thread:8645271808] Found internal task
34+
Job.NewParallel._work(): [Thread:8682049344] Found internal task
3535
Task.executed_with_callbacks(): node &lt;up_to_date 0 'inc.h'&gt;
3636
Task.postprocess(): node &lt;up_to_date 0 'inc.h'&gt;
3737
Task.postprocess(): removing &lt;up_to_date 0 'inc.h'&gt;
3838
Task.postprocess(): adjusted parent ref count &lt;pending 0 'prog.o'&gt;
39-
Job.NewParallel._work(): [Thread:8645271808] Searching for new tasks
39+
Job.NewParallel._work(): [Thread:8682049344] Searching for new tasks
4040

4141
Taskmaster: Looking for a node to evaluate
4242
Taskmaster: Considering node &lt;pending 0 'prog.o'&gt; and its children:
@@ -46,19 +46,19 @@ Taskmaster: Evaluating &lt;pending 0 'prog.o'&gt;
4646

4747
Task.make_ready_current(): node &lt;pending 0 'prog.o'&gt;
4848
Task.prepare(): node &lt;executing 0 'prog.o'&gt;
49-
Job.NewParallel._work(): [Thread:8645271808] Found task requiring execution
50-
Job.NewParallel._work(): [Thread:8645271808] Executing task
49+
Job.NewParallel._work(): [Thread:8682049344] Found task requiring execution
50+
Job.NewParallel._work(): [Thread:8682049344] Executing task
5151
Task.execute(): node &lt;executing 0 'prog.o'&gt;
5252
cc -o prog.o -c -I. prog.c
53-
Job.NewParallel._work(): [Thread:8645271808] Enqueueing executed task results
54-
Job.NewParallel._work(): [Thread:8645271808] Gained exclusive access
55-
Job.NewParallel._work(): [Thread:8645271808] Starting search
56-
Job.NewParallel._work(): [Thread:8645271808] Found 1 completed tasks to process
53+
Job.NewParallel._work(): [Thread:8682049344] Enqueueing executed task results
54+
Job.NewParallel._work(): [Thread:8682049344] Gained exclusive access
55+
Job.NewParallel._work(): [Thread:8682049344] Starting search
56+
Job.NewParallel._work(): [Thread:8682049344] Found 1 completed tasks to process
5757
Task.executed_with_callbacks(): node &lt;executing 0 'prog.o'&gt;
5858
Task.postprocess(): node &lt;executed 0 'prog.o'&gt;
5959
Task.postprocess(): removing &lt;executed 0 'prog.o'&gt;
6060
Task.postprocess(): adjusted parent ref count &lt;pending 0 'prog'&gt;
61-
Job.NewParallel._work(): [Thread:8645271808] Searching for new tasks
61+
Job.NewParallel._work(): [Thread:8682049344] Searching for new tasks
6262

6363
Taskmaster: Looking for a node to evaluate
6464
Taskmaster: Considering node &lt;pending 0 'prog'&gt; and its children:
@@ -67,21 +67,21 @@ Taskmaster: Evaluating &lt;pending 0 'prog'&gt;
6767

6868
Task.make_ready_current(): node &lt;pending 0 'prog'&gt;
6969
Task.prepare(): node &lt;executing 0 'prog'&gt;
70-
Job.NewParallel._work(): [Thread:8645271808] Found task requiring execution
71-
Job.NewParallel._work(): [Thread:8645271808] Executing task
70+
Job.NewParallel._work(): [Thread:8682049344] Found task requiring execution
71+
Job.NewParallel._work(): [Thread:8682049344] Executing task
7272
Task.execute(): node &lt;executing 0 'prog'&gt;
7373
cc -o prog prog.o
74-
Job.NewParallel._work(): [Thread:8645271808] Enqueueing executed task results
75-
Job.NewParallel._work(): [Thread:8645271808] Gained exclusive access
76-
Job.NewParallel._work(): [Thread:8645271808] Starting search
77-
Job.NewParallel._work(): [Thread:8645271808] Found 1 completed tasks to process
74+
Job.NewParallel._work(): [Thread:8682049344] Enqueueing executed task results
75+
Job.NewParallel._work(): [Thread:8682049344] Gained exclusive access
76+
Job.NewParallel._work(): [Thread:8682049344] Starting search
77+
Job.NewParallel._work(): [Thread:8682049344] Found 1 completed tasks to process
7878
Task.executed_with_callbacks(): node &lt;executing 0 'prog'&gt;
7979
Task.postprocess(): node &lt;executed 0 'prog'&gt;
80-
Job.NewParallel._work(): [Thread:8645271808] Searching for new tasks
80+
Job.NewParallel._work(): [Thread:8682049344] Searching for new tasks
8181

8282
Taskmaster: Looking for a node to evaluate
8383
Taskmaster: No candidate anymore.
84-
Job.NewParallel._work(): [Thread:8645271808] Found no task requiring execution, and have no jobs: marking complete
85-
Job.NewParallel._work(): [Thread:8645271808] Gained exclusive access
86-
Job.NewParallel._work(): [Thread:8645271808] Completion detected, breaking from main loop
84+
Job.NewParallel._work(): [Thread:8682049344] Found no task requiring execution, and have no jobs: marking complete
85+
Job.NewParallel._work(): [Thread:8682049344] Gained exclusive access
86+
Job.NewParallel._work(): [Thread:8682049344] Completion detected, breaking from main loop
8787
</screen>

0 commit comments

Comments
 (0)