Merge branch 'master' into jbrill-msvc-vscomntools

Manually resolve conflicts in RELEASE.txt

1 files changed, 25 insertions, 2 deletions

diff --git a/RELEASE.txt b/RELEASE.txt
index cf1078e..1096dbf 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -7,7 +7,7 @@ on the SCons download page:
 Here is a summary of the changes since 4.3.1:
 
 NOTE: If you build with Python 3.10.0 and then rebuild with 3.10.1 (or higher), you may
-      see unexpected rebuilds. This is due to Python internals changing which changed 
+      see unexpected rebuilds. This is due to Python internals changing which changed
       the signature of a Python Action Function.
 
 
@@ -16,6 +16,9 @@ NEW FUNCTIONALITY
 
 - Added MSVC_USE_SCRIPT_ARGS variable to pass arguments to MSVC_USE_SCRIPT.
 - Added Configure.CheckMember() checker to check if struct/class has the specified member.
+- Added SHELL_ENV_GENERATOR construction variables. This variable allows the user to Define
+  a function which will be called to generate or alter the execution environment which will
+  be used in the shell command of some Action.
 
 
 DEPRECATED FUNCTIONALITY
@@ -42,6 +45,8 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
 - The change to "content" and "content-timestamp" Decider names is reflected
   in the User Guide as well, since the hash function may be other than md5
   (tidying up from earlier change)
+- Update ninja file generation to only create response files for build commands
+  which exceed MAXLINELENGTH
 - Update the debug output written to stdout for MSVC initialization which is enabled
   by setting SCONS_MSCOMMON_DEBUG=- to use the logging module. Also changed the debug
   output format written to stdout to include more information about the source for each
@@ -62,7 +67,6 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
         typically not enabled by default on the host system. The batch files may also require
         environment variables that are not included by default in the msvc environment.
 
-
 FIXES
 -----
 
@@ -82,10 +86,28 @@ FIXES
   default compiler to MSVC which wasn't installed, yielding broken build.
   Updated mingw tool so that the generate and exists methods use the same mingw search paths
   (issue #4134).
+- Ninja: Added NINJA_GENERATED_SOURCE_ALIAS_NAME which allows user to specify an
+  Alias() which the ninja tool can use to determine which files are generated sources.
+  If this is not set by the user then the ninja tool will still dynamically determine
+  which files are generated sources based on NINJA_GENERATED_SOURCE_SUFFIXES, and create
+  a phony target _ninja_generated_sources. Generated sources will be built first by
+  ninja. This is needed because ninja cannot determine which generated sources are
+  required by other build targets.  Code contributed by MongoDB.
+- Added special case for ninja scons daemon to work in win32 python3.6 environments.
+  This particular environment does a bad job managing popen standard file handles, so
+  some special workarounds are needed.
+- Added user configurable setting of ninja depfile format via NINJA_DEPFILE_PARSE_FORMAT.
+  Now setting NINJA_DEPFILE_PARSE_FORMAT to [msvc,gcc,clang] can force the ninja expected
+  format. Compiler tools will also configure the variable automatically.
 - Fix issue where Express versions of the MSVC compiler were not detected due to differences
   in initial msvc detection and msvc batch file determination when configuring the build
   environment.  This could lead to build failures when only an MSVC Express instance is installed
   and the MSVC version is not explicitly specified (issue #2668 and issue #2697).
+- Restore the ability of the content-timestamp decider to see that a
+  a source which is a symlink has changed if the file-system target of
+  that link has been modified (issue #3880)
+- Fix typo in ninja scons daemon startup which causes ConnectionRefusedError to not retry 
+  to connect to the server during start up.
 - The system environment variable names imported for MSVC 7.0 and 6.0 were updated to be
   consistent with the variables names defined by their respective installers.  This fixes an
   error caused when bypassing MSVC detection by specifying the MSVC 7.0 batch file directly.
@@ -103,6 +125,7 @@ IMPROVEMENTS
   and msvc batch file determination when configuring the build environment.  Simplify the msvc
   code by eliminating special case handling primarily due to the differences between the full
   versions and express versions of visual studio.
+- Updated ninja scons daemon scripts to output errors to stderr as well as the daemon log.
 
 PACKAGING
 ---------