Update CHANGES.txt and RELEASE.txt: move text items and fix typographical errors to prepare for merge with latest.

Author: jcbrill

CHANGES.txt

@@ -42,12 +42,24 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       registry query that returns a path that does not exist.  Multiple invocation
       paths were not prepared to handle the MissingConfiguration exception.  The
       MissingConfiguration exception type was removed.
+    - The MSCommon module import was changed from a relative import to a top-level
+      absolute import in the following Microsoft tools: midl, mslib, mslink, mssdk, msvc,
+      msvs. Moving any of these tools that used relative imports to the scons site tools
+      folder would fail on import (i.e., the relative import paths become invalid when
+      moved).
+    - The detection of the msvc compiler executable (cl.exe) has been modified.  The
+      compiler detection no longer considers the host os environment path.  In addition,
+      existence of the msvc compiler executable is checked in the detection dictionary
+      and the scons ENV path before the detection dictionary is merged into the scons
+      ENV.  Different warnings are produced when the msvc compiler is not detected in the
+      detection dictionary based on whether or not an msvc compiler was detected in the
+      scons ENV path (i.e., already exists in the user's ENV path prior to detection).
     - For msvc version specifications without an 'Exp' suffix, an express installation
       is used when no other edition is detected for the msvc version.
-    - VS2015 Express (14.1Exp) may not have been detected. The registry keys written
+    - VS2015 Express (14.0Exp) may not have been detected. The registry keys written
       during installation appear to be different than for earlier express versions.
       VS2015 Express should be correctly detected now.
-    - VS2015 Express (14.1Exp) does not support the sdk version argument.  VS2015 Express
+    - VS2015 Express (14.0Exp) does not support the sdk version argument.  VS2015 Express
       does not support the store argument for target architectures other than x86.
       Script argument validation now takes into account these restrictions.
     - VS2015 BuildTools (14.0) does not support the sdk version argument and does not
@@ -60,11 +72,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       batch files will fail. The msvc detection logic now ignores SDK-only VS2010
       installations.  Similar protection is implemented for the sdk-only installs that
       populate the installation folder and registry keys for VS2008 (9.0), if necessary.
-    - The MSCommon module import was changed from a relative import to a top-level
-      absolute import in the following Microsoft tools: midl, mslib, mslink, mssdk, msvc,
-      msvs. Moving any of these tools that used relative imports to the scons site tools
-      folder would fail on import (i.e., the relative import paths become invalid when
-      moved).
     - For VS2005 (8.0) to VS2015 (14.0), vsvarsall.bat is employed to dispatch to a
       dependent batch file when configuring the msvc environment.  Previously, only the
       existence of the compiler executable was verified. In certain installations, the
@@ -88,13 +95,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       of the results from all vswhere executables).  There is a single invocation for
       each vswhere executable that processes the output for all installations.  Prior
       implementations called the vswhere executable for each supported msvc version.
-    - The detection of the msvc compiler executable (cl.exe) has been modified.  The
-      compiler detection no longer considers the host os environment path.  In addition,
-      existence of the msvc compiler executable is checked in the detection dictionary
-      and the scons ENV path before the detection dictionary is merged into the scons
-      ENV.  Different warnings are produced when the msvc compiler is not detected in the
-      detection dictionary based on whether or not an msvc compiler was detected in the
-      scons ENV path (i.e., already exists in the user's ENV path prior to detection).
     - Previously, the installed vcs list was constructed once and cached at runtime.  If
       a vswhere executable was specified via the construction variable VSWHERE and found
       additional msvc installations, the new installations were not reflected in the

RELEASE.txt

@@ -59,10 +59,6 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
   batch file exists but an individual msvc toolset may not support the host/target
   architecture combination.  For example, when using VS2022 on arm64, the arm64 native
   tools are only installed for the 14.3x toolsets.
-- MSVC: For msvc version specifications without an 'Exp' suffix, an express
-  installation is used when no other edition is detected for the msvc version.
-  This was the behavior for VS2008 (9.0) through VS2015 (14.0).  This behavior
-  was extended to VS2017 (14.1) and VS2008 (8.0).
 - MSVC: When the msvc compiler executable is not found during setup of the msvc
   environment, the warning message issued takes into account whether or not a
   possibly erroneous compiler executable was already present in the scons environment
@@ -86,6 +82,10 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
   although the preferred usage remains to import from SCons.Util only.
   Any code that did the direct import will have to change to import from
   SCons.Util.sctypes.
+- MSVC: For msvc version specifications without an 'Exp' suffix, an express
+  installation is used when no other edition is detected for the msvc version.
+  This was the behavior for VS2008 (9.0) through VS2015 (14.0).  This behavior
+  was extended to VS2017 (14.1) and VS2008 (8.0).
 
 FIXES
 -----
@@ -109,7 +109,23 @@ FIXES
 - MSVC: Erroneous construction of the installed msvc list (as described above) caused an
   index error in the msvc support code.  An explicit check was added to prevent indexing
   into an empty list.  Fixes #4312.
-- MSVC: VS2015 Express (14.1Exp) may not have been detected. VS2015 Express should
+- MSVC: The search for the msvc compiler executable (cl.exe) no longer inspects the
+  OS system path in certain situations when setting up the msvc environment.
+- MSCommon: Test SConfTests.py would fail when mscommon debugging was enabled via the
+  MSVC_MSCOMMON_DEBUG environment variable.  The mscommon logging filter class registered
+  with the python logging module was refactored to prevent test failure.
+- MSVS: Add arm64 to the MSVS supported architectures list for VS2017 and later to be
+  consistent with the current documentation of MSVS_ARCH.
+- FORTRAN: Fix gfortran tool initialization. Defaults to using binary named gfortran
+  as would be expected, and properly set's SHFORTRAN flags to include -fPIC
+  where previously it was only doing so for the other fortran versions (F77,..)
+- MSCommon: Added more error handling while reading msvc config cache.
+  (Enabled/specified by SCONS_CACHE_MSVC_CONFIG).
+  The existing cache will be discarded if there's a decode error reading it.
+  It's possible there's a race condition creating this issue it in certain CI builds.
+- Fixed: race condition in `Mkdir` which can happen when two `SConscript`
+  are processed simultaneously by two separate build commands.
+- MSVC: VS2015 Express (14.0Exp) may not have been detected. VS2015 Express should
   be correctly detected.
 - MSVC: VS2010 (10.0) could be inadvertently detected due to an sdk-only install
   of Windows SDK 7.1.  An sdk-only install of VS2010 is ignored as the msvc batch
@@ -122,43 +138,27 @@ FIXES
 - MSVC: VS2008 (9.0) Visual C++ For Python was not detected when installed using the
   ALLUSERS=1 option (i.e., msiexec /i VCForPython27.msi ALLUSERS=1).  When installed
   for all users, VS2008 (9.0) Visual C++ For Python is now correctly detected.
-- MSVC: The search for the msvc compiler executable (cl.exe) no longer inspects the
-  OS system path in certain situations when setting up the msvc environment.
 - MSVC: The installed vcs list was constructed and cached during the initial
   invocation. If a vswhere executable was specified via the construction variable
   VSWHERE and found additional msvc installations, the new installations were not
   reflected in the installed vcs list. Now, when a user-specified vswhere executable
   finds new msvc installations, the installed vcs list is reconstructed.
-- MSCommon: Test SConfTests.py would fail when mscommon debugging was enabled via the
-  MSVC_MSCOMMON_DEBUG environment variable.  The mscommon logging filter class registered
-  with the python logging module was refactored to prevent test failure.
-- MSVS: Add arm64 to the MSVS supported architectures list for VS2017 and later to be
-  consistent with the current documentation of MSVS_ARCH.
-- FORTRAN: Fix gfortran tool initialization. Defaults to using binary named gfortran
-  as would be expected, and properly set's SHFORTRAN flags to include -fPIC
-  where previously it was only doing so for the other fortran versions (F77,..)
-- MSCommon: Added more error handling while reading msvc config cache.
-  (Enabled/specified by SCONS_CACHE_MSVC_CONFIG).
-  The existing cache will be discarded if there's a decode error reading it.
-  It's possible there's a race condition creating this issue it in certain CI builds.
-- Fixed: race condition in `Mkdir` which can happen when two `SConscript`
-  are processed simultaneously by two separate build commands.
 
 IMPROVEMENTS
 ------------
 
 - Now tries to find mingw if it comes from Chocolatey install of msys2.
-- MSVC: VS2015 Express (14.1Exp) does not support the sdk version argument. VS2015
-  Express does not support the store argument for target architectures other than
-  x86.  Script argument validation now takes into account these restrictions.
-- MSVC: VS2015 BuildTools (14.0) does not support the sdk version argument and
-  does not support the store argument.  Script argument validation now takes into
-  account these restrictions.
 - MSVC: Module imports were changed from a relative import to a top-level
   absolute import in the following Microsoft tools: midl, mslib, mslink, mssdk, msvc,
   msvs. Moving any of these tools that used relative imports to the scons site tools
   folder would fail on import (i.e., the relative import paths become invalid when
   moved).
+- MSVC: VS2015 Express (14.0Exp) does not support the sdk version argument. VS2015
+  Express does not support the store argument for target architectures other than
+  x86.  Script argument validation now takes into account these restrictions.
+- MSVC: VS2015 BuildTools (14.0) does not support the sdk version argument and
+  does not support the store argument.  Script argument validation now takes into
+  account these restrictions.
 
 PACKAGING
 ---------