Merge pull request #4328 from SCons/rel_4.5.2

Release 4.5.2

5 files changed, 21 insertions, 54 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 8bb3c21f7..2c11cb48c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@
 NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
+RELEASE 4.5.2 -  Sun, 21 Mar 2023 14:08:29 -0700
 
   From Michał Górny:
     - Remove the redundant `wheel` dependency from `pyproject.toml`,
diff --git a/RELEASE.txt b/RELEASE.txt
index 4e25b9522..12a275e7c 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1,45 +1,19 @@
-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.5.2, is now available on the SCons download page:
 
     https://scons.org/pages/download.html
 
-
 Here is a summary of the changes since 4.5.1:
 
-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
 -----
 
-- 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
+-  Fix a problem (#4321) in 4.5.0/4.5.1 where ParseConfig could cause an
+   exception in MergeFlags when the result would be to add preprocessor
+   defines to existing CPPDEFINES. The following code illustrates the
+   circumstances that could trigger this:
+      env=Environment(CPPDEFINES=['a'])
+      env.Append(CPPDEFINES=['b'])
+      env.MergeFlags({'CPPDEFINES': 'c'})
 
 PACKAGING
 ---------
@@ -47,20 +21,12 @@ PACKAGING
 - Remove the redundant `wheel` dependency from `pyproject.toml`,
   as it is added automatically by the setuptools PEP517 backend.
 
-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.0.1..HEAD
+    git shortlog --no-merges -ns 4.5.1..HEAD
+     3  Mats Wichmann
+     2  William Deegan
+     1  Michał Górny
diff --git a/SCons/__init__.py b/SCons/__init__.py
index f53583b12..12be8e6c4 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
-__version__="4.5.1"
+__version__="4.5.2"
 __copyright__="Copyright (c) 2001 - 2023 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="Mon, 06 Mar 2023 23:32:38 -0400"
+__date__="Tue, 21 Mar 2023 12:11:27 -0400"
 __buildsys__="M1DOG2021"
-__revision__="49578b34582d9e92dac7d713a8e58599ae35aa63"
-__build__="49578b34582d9e92dac7d713a8e58599ae35aa63"
+__revision__="120fd4f633e9ef3cafbc0fec35306d7555ffd1db"
+__build__="120fd4f633e9ef3cafbc0fec35306d7555ffd1db"
 # make sure compatibility is always in place
 import SCons.compat # noqa
\ No newline at end of file
diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh
index 607512ebc..65e92062b 100755
--- a/bin/upload-release-files.sh
+++ b/bin/upload-release-files.sh
@@ -27,7 +27,7 @@ $RSYNC $RSYNCOPTS\
        README.rst \
        $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons/
 
-	
+
 # Upload main scons release files:
 $RSYNC $RSYNCOPTS \
   SCons-$VERSION.tar.gz \
@@ -39,6 +39,7 @@ $RSYNC $RSYNCOPTS \
 $RSYNC $RSYNCOPTS \
   scons-local-$VERSION.tar.gz \
   scons-local-$VERSION.zip \
+  scons-local-$VERSION.pyz \
   CHANGES.txt RELEASE.txt \
   $SF_USER@$SF_MACHINE:$SF_TOPDIR/scons-local/$VERSION/
 
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 266eaa0d4..477338009 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,8 +1,8 @@
 <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>
-cc -o f2.o -c f2.c
-cc -o f3.o -c f3.c
 cc -o f1.o -c f1.c
-cc -o f5.o -c f5.c
 cc -o f4.o -c f4.c
+cc -o f2.o -c f2.c
+cc -o f5.o -c f5.c
+cc -o f3.o -c f3.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>