Skip to content

Commit b0d005f

Browse files
committed
Updated NEXT_RELEASE->4.10.0. Regenerated doc generated doc files
1 parent 6d2d612 commit b0d005f

15 files changed

+76
-101
lines changed

CHANGES.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ NOTE: Since SCons 4.3.0, Python 3.6.0 or above is required.
1010
NOTE: Since SCons 4.9.0, Python 3.7.0 or above is required.
1111

1212

13-
RELEASE VERSION/DATE TO BE FILLED IN LATER
14-
15-
From John Doe:
16-
- Whatever John Doe did.
13+
RELEASE 4.10.0 - Thu, 02 Oct 2025 11:40:20 -0700
1714

1815
From Joseph Brill:
1916
- MSVC: A significant delay was experienced in the Github Actions windows

RELEASE.txt

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
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, X.Y.Z, is now available on the SCons download page:
1+
A new SCons release, 4.9.10, is now available on the SCons download page:
102

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

135
Here is a summary of the changes since 4.9.1:
146

157

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
25-
268
CHANGED/ENHANCED EXISTING FUNCTIONALITY
279
---------------------------------------
2810

29-
- List modifications to existing features, where the previous behavior
30-
wouldn't actually be considered a bug
31-
3211
- Nodes are now treated as PathLike objects.
3312

3413
- Replace use of old conditional expression idioms with the official
@@ -101,10 +80,6 @@ FIXES
10180
IMPROVEMENTS
10281
------------
10382

104-
- List improvements that wouldn't be visible to the user in the
105-
documentation: performance improvements (describe the circumstances
106-
under which they would be observed), or major code cleanups
107-
10883
- Virtualenv support module modernized: previously looked first for an
10984
unofficial approach from before venv support was made part of Python
11085
in 3.3; now looks for the official approach first. This in an internal
@@ -120,8 +95,6 @@ IMPROVEMENTS
12095
PACKAGING
12196
---------
12297

123-
- List changes in the way SCons is packaged and/or released
124-
12598
- The generated roff (.1) manpages are now included in the
12699
scons-doc tarball that is built at part of the release process,
127100
in addition to the html and txt versions. For distribution
@@ -132,10 +105,6 @@ PACKAGING
132105
DOCUMENTATION
133106
-------------
134107

135-
- List any significant changes to the documentation (not individual
136-
typo fixes, even if they're mentioned in src/CHANGES.txt to give
137-
the contributor credit)
138-
139108
- Clarify how pre/post actions on an alias work.
140109

141110
- Improve the description of PackageVariable.
@@ -163,8 +132,6 @@ DOCUMENTATION
163132
DEVELOPMENT
164133
-----------
165134

166-
- List visible changes in the way SCons is developed
167-
168135
- runtest.py once again finds "external" tests, such as the tests for
169136
tools in scons-contrib. An earlier rework had broken this. Fixes #4699.
170137

SCons/Environment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ def __getattr__(self, name):
13041304
other parts of SCons depend on seeing the :exc:`AttributeError` that
13051305
triggers this call, so all we do is produce our own message.
13061306
1307-
.. versionadded:: NEXT_RELEASE
1307+
.. versionadded:: 4.10.0
13081308
"""
13091309
raise AttributeError(
13101310
f"Builder or other environment method {name!r} not found.\n"

SCons/Executor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def get_lvars(self):
204204
def _get_changes(self) -> None:
205205
"""Populate all the changed/unchanged lists.
206206
207-
.. versionchanged:: NEXT_RELEASE
207+
.. versionchanged:: 4.10.0
208208
``_changed_sources``, ``_changed_targets``, ``_unchanged_sources``
209209
and ``_unchanged_targets`` are no longer separate instance
210210
attributes, but rather saved in the :attr:`_memo` dict.

SCons/Platform/Platform.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ be represented in the 7-bit ASCII characer set),
459459
set this variable to the appropriate codec.
460460
See also &cv-link-TEMPFILEDIR;.
461461
</para>
462-
<para><emphasis>New in version NEXT_RELEASE</emphasis></para>
462+
<para><emphasis>New in version 4.10.0</emphasis></para>
463463
</summary>
464464
</cvar>
465465

SCons/Script/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def _Remove_Argument(aarg: str) -> None:
235235
could not recognize it belongs to an option and is not a standalone
236236
variable=value argument.
237237
238-
.. versionadded:: NEXT_RELEASE
238+
.. versionadded:: 4.10.0
239239
240240
"""
241241
if aarg:
@@ -261,7 +261,7 @@ def _Remove_Target(targ: str) -> None:
261261
Since we are "correcting an error", we also have to fix up the internal
262262
:data:`_build_plus_default` list.
263263
264-
.. versionadded:: NEXT_RELEASE
264+
.. versionadded:: 4.10.0
265265
266266
"""
267267
if targ:

doc/generated/builders.gen

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,38 +2419,41 @@ when it is done linking it.
24192419
Builds an object file intended for
24202420
inclusion in a shared library.
24212421
Source files must have one of the same set of extensions
2422-
specified above for the
2423-
&b-StaticObject;
2422+
specified for the
2423+
&b-link-StaticObject;
24242424
builder method.
2425-
On some platforms building a shared object requires additional
2426-
compiler option
2427-
(e.g. <option>-fPIC</option> for <command>gcc</command>)
2428-
in addition to those needed to build a
2429-
normal (static) object, but on some platforms there is no difference between a
2430-
shared object and a normal (static) one. When there is a difference, SCons
2431-
will only allow shared objects to be linked into a shared library, and will
2432-
use a different suffix for shared objects. On platforms where there is no
2433-
difference, SCons will allow both normal (static)
2434-
and shared objects to be linked into a
2435-
shared library, and will use the same suffix for shared and normal
2436-
(static) objects.
24372425
The target object file prefix,
24382426
specified by the &cv-link-SHOBJPREFIX; &consvar;
24392427
(by default, the same as &cv-link-OBJPREFIX;),
24402428
and suffix,
24412429
specified by the &cv-link-SHOBJSUFFIX; &consvar;,
24422430
are automatically added to the target if not already present.
2431+
&b-SharedObject; is a single-source builder.
24432432
Examples:
24442433
</para>
24452434

24462435
<example_commands>
24472436
env.SharedObject(target='ddd', source='ddd.c')
24482437
env.SharedObject(target='eee.o', source='eee.cpp')
24492438
env.SharedObject(target='fff.obj', source='fff.for')
2439+
env.SharedObject(source=Glob('*.c'))
24502440
</example_commands>
24512441

24522442
<para>
2453-
Note that the source files will be scanned
2443+
On some platforms building a shared object requires additional
2444+
compiler option(s)
2445+
(e.g. <option>-fPIC</option> for <command>gcc</command>)
2446+
in addition to those needed to build a
2447+
normal (static) object.
2448+
If shared and static objects differ,
2449+
&SCons; will allow only shared objects
2450+
to be linked into a shared library,
2451+
and will use a different suffix for shared objects
2452+
to help indicate and track the difference.
2453+
</para>
2454+
2455+
<para>
2456+
Source files will be scanned
24542457
according to the suffix mappings in the
24552458
<classname>SourceFileScanner</classname>
24562459
object.
@@ -2502,10 +2505,10 @@ will raise an error if there is any mismatch.
25022505
<listitem><para>
25032506
Builds a static object file
25042507
from one or more C, C++, D, or Fortran source files.
2505-
Source files must have one of the following extensions:
2508+
The file extension mapping is shown in the table:
25062509
</para>
25072510

2508-
<example_commands>
2511+
<literallayout><literal>
25092512
.asm assembly language file
25102513
.ASM assembly language file
25112514
.c C file
@@ -2534,28 +2537,30 @@ Source files must have one of the following extensions:
25342537
POSIX: assembly language file + C pre-processor
25352538
.spp assembly language file + C pre-processor
25362539
.SPP assembly language file + C pre-processor
2537-
</example_commands>
2540+
</literal></literallayout>
25382541

25392542
<para>
25402543
The target object file prefix,
25412544
specified by the &cv-link-OBJPREFIX; &consvar;
2542-
(nothing by default),
2545+
(empty string by default),
25432546
and suffix,
25442547
specified by the &cv-link-OBJSUFFIX; &consvar;
25452548
(<filename>.obj</filename> on Windows systems,
25462549
<filename>.o</filename> on POSIX systems),
25472550
are automatically added to the target if not already present.
2551+
&b-StaticObject; is a single-source builder.
25482552
Examples:
25492553
</para>
25502554

25512555
<example_commands>
25522556
env.StaticObject(target='aaa', source='aaa.c')
25532557
env.StaticObject(target='bbb.o', source='bbb.c++')
25542558
env.StaticObject(target='ccc.obj', source='ccc.f')
2559+
env.StaticObject(source=Glob('*.c'))
25552560
</example_commands>
25562561

25572562
<para>
2558-
Note that the source files will be scanned
2563+
Source files will be scanned
25592564
according to the suffix mappings in the
25602565
<classname>SourceFileScanner</classname>
25612566
object.
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
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-
AttributeError: 'SConsEnvironment' object has no attribute 'Program':
2+
AttributeError: Builder or other environment method 'Program' not found.
3+
Check spelling, check external program exists in env['ENV']['PATH'],
4+
and check that a suitable tool is being loaded:
35
File "/home/my/project/SConstruct", line 7:
46
env.Program('hello.c')
7+
File "SCons/Environment.py", line 1309:
8+
raise AttributeError(
59
</screen>

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 f5.o -c f5.c
23
cc -o f4.o -c f4.c
34
cc -o f1.o -c f1.c
4-
cc -o f5.o -c f5.c
55
cc -o f3.o -c f3.c
66
cc -o f2.o -c f2.c
77
cc -o prog f1.o f2.o f3.o f4.o f5.o

doc/generated/examples/troubleshoot_Dump_2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ scons: Reading SConscript files ...
1313
'CCDEPFLAGS': '/showIncludes',
1414
'CCFLAGS': ['/nologo'],
1515
'CCPCHFLAGS': &lt;function gen_ccpchflags at 0x700000&gt;,
16-
'CCPDBFLAGS': ['${(PDB and "/Z7") or ""}'],
16+
'CCPDBFLAGS': ['${"/Z7" if PDB else ""}'],
1717
'CFILESUFFIX': '.c',
1818
'CFLAGS': [],
1919
'CONFIGUREDIR': '#/.sconf_temp',
@@ -74,7 +74,7 @@ scons: Reading SConscript files ...
7474
'PCHCOM': '$CXX /Fo${TARGETS[1]} $CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS '
7575
'$_CPPINCFLAGS /c $SOURCES /Yc$PCHSTOP /Fp${TARGETS[0]} '
7676
'$CCPDBFLAGS $PCHPDBFLAGS',
77-
'PCHPDBFLAGS': ['${(PDB and "/Yd") or ""}'],
77+
'PCHPDBFLAGS': ['${"/Yd" if PDB else ""}'],
7878
'PLATFORM': 'win32',
7979
'PROGPREFIX': '',
8080
'PROGSUFFIX': '.exe',

0 commit comments

Comments
 (0)