Merge branch 'master' into rel_4.9.1

Author: bdbaddog

CHANGES.txt

@@ -10,6 +10,13 @@ NOTE: Since SCons 4.3.0, Python 3.6.0 or above is required.
 NOTE: Since SCons 4.9.0, Python 3.7.0 or above is required.
 
 
+RELEASE  VERSION/DATE TO BE FILLED IN LATER
+
+      From John Doe:
+
+        - Whatever John Doe did.
+
+
 RELEASE 4.9.1 -  Thu, 27 Mar 2025 11:40:20 -0700
 
 

RELEASE.txt

@@ -1,25 +1,65 @@
-A new SCons release, 4.9.1, is now available on the SCons download page:
+If you are reading this in the git repository, the contents
+refer to *unreleased* changes since the last SCons release.
+Past official release announcements appear at:
+
+    https://scons.org/tag/releases.html
+
+==================================================================
+
+A new SCons release, 4.9.0, is now available on the SCons download page:
 
     https://scons.org/pages/download.html
 
 
 Here is a summary of the changes since 4.9.0:
 
+NEW FUNCTIONALITY
+-----------------
+
+- List new features (presumably why a checkpoint is being released)
+
+DEPRECATED FUNCTIONALITY
+------------------------
+
+- List anything that's been deprecated since the last release
+
+CHANGED/ENHANCED EXISTING FUNCTIONALITY
+---------------------------------------
+
+- List modifications to existing features, where the previous behavior
+  wouldn't actually be considered a bug
+
 FIXES
 -----
-- New CacheDir initialization code failed on Python 3.7 for unknown
-  reason (worked on 3.8+). Adjusted the approach a bit.  Fixes #4694.
 
-- Fixed a hang in `wait_for_process_to_die()` on Windows, affecting
-  clean-up of the SCons daemon used for Ninja builds.
+- List fixes of outright bugs
+
+IMPROVEMENTS
+------------
+
+- List improvements that wouldn't be visible to the user in the
+  documentation:  performance improvements (describe the circumstances
+  under which they would be observed), or major code cleanups
+
+PACKAGING
+---------
+
+- List changes in the way SCons is packaged and/or released
+
+DOCUMENTATION
+-------------
+
+- List any significant changes to the documentation (not individual
+  typo fixes, even if they're mentioned in src/CHANGES.txt to give
+  the contributor credit)
 
+DEVELOPMENT
+-----------
 
+- List visible changes in the way SCons is developed
 
 Thanks to the following contributors listed below for their contributions to this release.
 ==========================================================================================
 .. code-block:: text
 
-    git shortlog --no-merges -ns 4.9.0..HEAD
-         7  Mats Wichmann
-         4  William Deegan
-         2  Adam Simpkins
+    git shortlog --no-merges -ns 4.0.1..HEAD

ReleaseConfig

@@ -31,7 +31,7 @@
 # If the release type is not 'final', the patchlevel is set to the
 # release date.  This value is mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (4, 9, 1)
+version_tuple = (4, 9, 2, 'a', 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version

doc/user/main.xml

@@ -36,7 +36,7 @@ This file is processed by the bin/SConsDoc.py module.
 
     <corpauthor>The SCons Development Team</corpauthor>
 
-    <pubdate>Released: Mon, 27 Mar 2025 11:40:11 -0700</pubdate>
+    <pubdate>Released: Mon, 27 Mar 2025 13:46:28 -0700</pubdate>
 
     <copyright>
         <year>2004 - 2025</year>

testing/framework/TestSCons.py

@@ -54,7 +54,7 @@
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '4.9.1'
+default_version = '4.9.2ayyyymmdd'
 
 # TODO: these need to be hand-edited when there are changes
 python_version_unsupported = (3, 7, 0)