Merge branch 'master' into doc/builder-methods

Author: bdbaddog

.appveyor.yml

@@ -8,7 +8,7 @@ image:
   # linux builds done in Travis CI for now
   - Visual Studio 2017
   - Visual Studio 2019
-  #- Visual Studio 2022  # Temporary disable while failing on 14.40 build tools
+  - Visual Studio 2022
 
 cache:
   - downloads -> appveyor.yml
@@ -35,40 +35,37 @@ environment:
   SCONS_CACHE_MSVC_CONFIG: "true"
   matrix:
     # Test oldest and newest supported Pythons, and a subset in between.
-    # Skipping 3.7 and 3.9 at this time
-    - WINPYTHON: "Python312"
-    - WINPYTHON: "Python310"
-    - WINPYTHON: "Python38"
-    - WINPYTHON: "Python36"
+    # Skipping 3.8, 3.10, 3.12 at this time
+    - WINPYTHON: "Python313"
+    - WINPYTHON: "Python311"
+    - WINPYTHON: "Python39"
+    - WINPYTHON: "Python37"
 
 # remove sets of build jobs based on criteria below
 # to fine tune the number and platforms tested
 matrix:
   exclude:
-    # XXX test python 3.6 on Visual Studio 2017 image
-    # test python 3.8 on Visual Studio 2017 image
+    # test python 3.7 on Visual Studio 2017 image
     - image: Visual Studio 2017
-      WINPYTHON: "Python312"
+      WINPYTHON: "Python313"
     - image: Visual Studio 2017
-      WINPYTHON: "Python310"
+      WINPYTHON: "Python311"
     - image: Visual Studio 2017
-      WINPYTHON: "Python36"
+      WINPYTHON: "Python39"
 
-    # test python 3.10 on Visual Studio 2019 image
+    # test python 3.9 on Visual Studio 2019 image
     - image: Visual Studio 2019
-      WINPYTHON: "Python312"
+      WINPYTHON: "Python313"
     - image: Visual Studio 2019
-      WINPYTHON: "Python38"
+      WINPYTHON: "Python311"
     - image: Visual Studio 2019
-      WINPYTHON: "Python36"
+      WINPYTHON: "Python37"
 
-    # test python 3.12 on Visual Studio 2022 image
+    # test python 3.11, 3.13 on Visual Studio 2022 image
     - image: Visual Studio 2022
-      WINPYTHON: "Python310"
+      WINPYTHON: "Python39"
     - image: Visual Studio 2022
-      WINPYTHON: "Python38"
-    - image: Visual Studio 2022
-      WINPYTHON: "Python36"
+      WINPYTHON: "Python37"
 
 # Remove some binaries we don't want to be found
 # Note this is no longer needed, git-windows bin/ is quite minimal now.

CHANGES.txt

@@ -7,11 +7,67 @@
 NOTE: The 4.0.0 release of SCons dropped Python 2.7 support. Use 3.1.2 if
   Python 2.7 support is required (but note old SCons releases are unsupported).
 NOTE: Since SCons 4.3.0, Python 3.6.0 or above is required.
-NOTE: Python 3.6 support is deprecated and will be dropped in a future release.
-  python.org no longer supports 3.6 or 3.7, and will drop 3.8 in Oct. 2024.
+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.
+
+  From Bill Prendergast:
+    - Fixed SCons.Variables.PackageVariable to correctly test the default
+      setting against both enable & disable strings. (Fixes #4702)
+    - Extended unittests (crudely) to test for correct/expected response
+      when default setting is a boolean string.
+
+  From Mats Wichmann:
+    - Clean up C and C++ FLAGS tests. Tests which use a real compiler
+      are now more clearly distinguished (-live.py suffix and docstring).
+    - runtest.py once again finds "external" tests, such as the tests for
+      tools in scons-contrib. An earlier rework had broken this.  Fixes #4699.
+    - Clarify how pre/post actions on an alias work.
+    - Improve the Builder Methods intro section in manpage, making sure
+      all prose appears before the listing of methods.
+
+
+
+RELEASE 4.9.1 -  Thu, 27 Mar 2025 11:40:20 -0700
+
+
+  From Adam Simpkins:
+    - Fixed a hang in `wait_for_process_to_die()` on Windows, affecting
+      clean-up of the SCons daemon used for Ninja builds.
+
+  From Thaddeus Crews:
+    - Nodes are now treated as PathLike objects.
+
+  From Mats Wichmann:
+    - Fix typos in CCFLAGS test. Didn't affect the test itself, but
+      didn't correctly apply the DefaultEnvironment speedup.
+
+    - New CacheDir initialization code failed on Python 3.7 for unknown
+      reason (worked on 3.8+). Adjusted the approach a bit.  Fixes #4694.
+    - Try to fix Windows fails on Docbook tests in case xsltproc is found.
+      It's still not certain why this started failing.  On both GitHub
+      Actions and AppVeyor, it's found as part of StrawberryPerl, part of
+      the default install - maybe this wasn't the case before? The xsltproc
+      from choco install is considerably older and may have been more lenient?
+      Anyway, intermittent fails seem caused by something network related,
+      so propagate two xsltproc flags that avoid loading the dtd that were
+      present in three of the 11 "live" tests, but not the other eight.
+      Also, all 11 now pass the test-discovered xslt processor the same
+      way, which was not the case previously.
+    - Update progress printing on three tools for SCons developers -
+      the test runner and two of the doc generators.
+
+
+RELEASE 4.9.0 -  Sun, 02 Mar 2025 17:22:20 -0700
+
+  From Ruben Di Battista:
+    - Expose `extra_libs` kwarg in Configure checks `CheckLibWithHeader`
+      and 'CheckLib' and forward it downstream to `CheckLib`
+
   From Joseph Brill:
     - Added error handling when creating MSVC detection debug log file specified by
       SCONS_MSCOMMON_DEBUG.
@@ -96,6 +152,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       specified `local_only`, but the code and tests were using `keep_local`. The functionality
       more closely matches local only.  NOTE: It doesn't seem like any code in the wild was using
       local_only as we'd not received any reports of such until PR #4606 from hedger.
+    - Fix Issue #2281, AddPreAction() & AddPostAction() were being ignored if no action
+      was specified when the Alias was initially created.
 
   From Alex James:
     - On Darwin, PermissionErrors are now handled while trying to access
@@ -111,6 +169,11 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From Keith F Prussing:
     - Added support for tracking beamer themes in the LaTeX scanner.
 
+  From Adam Scott:
+    - Changed Ninja's TEMPLATE rule pool to use `install_pool` instead of
+      `local_pool`, hoping it will fix a race condition that can occurs when
+      Ninja defers to SCons to build.
+
   From Alex Thiessen:
     - Many grammatical and spelling fixes in the documentation.
 
@@ -198,13 +261,12 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       attribute and to explain what's being done in the example.
     - Test framework reformatted using settings from pyproject.toml.
       Includes code embedded in docstrings.
-    - Improve the Builder Methods intro section in manpage, making sure
-      all prose appears before the listing of methods.
-
-    From Adam Scott:
-    - Changed Ninja's TEMPLATE rule pool to use `install_pool` instead of
-      `local_pool`, hoping it will fix a race condition that can occurs when
-      Ninja defers to SCons to build.
+    - Handle case of "memoizer" as one member of a comma-separated
+      --debug string - this was previously missed.
+    - test YACC/live.py fixed - finally started failing on an "old-style"
+      (K&R flavor) function declaration, updated.
+    - Test framework - add recognizing list-of-path-components for
+      the destination of fixtures too (matches docstrings now).
 
 
 RELEASE 4.8.1 -  Tue, 03 Sep 2024 17:22:20 -0700

CONTRIBUTING.rst

@@ -6,20 +6,22 @@ Introduction
 
 Thanks for taking the time to contribute to SCons!
 
-This will give a brief overview of the development process,
+This is a brief overview of the development process,
 and about the SCons tree (right here, if you're reading this
-in Github, or in a cloned repository).
+in Github, or in a repository clone).
 
 There are lots of places we could use help - please don't
 think we're only interested in contributions to code.
 
 If you're going to contribute, we'd love to get to know you
-a bit and understand and what problems you're looking to solve,
+a bit and understand what problems you're looking to solve,
 or what you are intending to improve, whether that's documentation,
 code, examples, tutorials, etc. A great way to introduce yourself is to
 to hop onto the `SCons Discord Server <https://discord.gg/bXVpWAy>`_
-to chat.  You don't have to be a regular Discord user,
-there is a web interface.
+to chat.  You don't have to use the Discord app,
+as there is a web interface (does require an account).
+You can also use the
+`SCons Users Mailing List <https://pairlist4.pair.net/mailman/listinfo/scons-users>`_.
 
 Resources
 =========
@@ -38,15 +40,20 @@ Reporting Bugs
 
 One of the easiest ways to contribute is by filing bugs.
 The SCons project welcomes bug reports and feature requests,
-but we *do* have a preference for having talked about them first -
-we request you send an email to the
-`SCons Users Mailing List <https://pairlist4.pair.net/mailman/listinfo/scons-users>`_
-or hop on the Discord channel (see link above), and if so
-instructed, then proceed to an issue report.
+but unless they're really trivial (like doc typos),
+we *do* have a preference for having talked about them first.
+This step helps identify possible collaborators and reviewers,
+and pre-screens issues that may already have solutions,
+be in progress, or perhaps are the result of a misunderstanding.
+You can either ask on the Discord channel (see link above),
+or send am email to the mailing list.
+You can also use
+`GitHub Discussions <https://github.com/SCons/scons/discussions>`_.
+If so instructed, please proceed to an issue report.
 
 You can explore the list of existing bugs on GitHub.
 Sometimes there's work in progress which may include temporary
-workarounds for the problem you've run into::
+workarounds for the problem you are running into::
 
     https://github.com/SCons/scons/issues
 
@@ -58,12 +65,12 @@ This tree contains a lot more than just the SCons engine itself.
 Some of it has to do with packaging it in a couple
 of forms: a Python-installable package (source distribution
 and installable wheel file, which get uploaded to the Python
-Package Index), a portable zip (or tar) distribution
+Package Index, PyPI), a portable zip (or tar) distribution
 called "scons-local", and a full source bundle.  You usually
 don't need to worry about the packaging parts when working
 on a source or doc contribution - unless you're adding an entirely
-new file, then the packaging bits may need to know about it. The
-project maintainers can usually help with that part.
+new file, then the packaging bits may need to know about it.
+The project maintainers can help with that part.
 There are also tests and tools in the tree.
 
 The *full* development cycle is not just to test code changes directly,
@@ -111,7 +118,7 @@ on the documentation process at the Documentation Toolchain page:
     https://github.com/SCons/scons/blob/master/doc/overview.rst
 
 
-You can execute SCons directly from this repository. For Linux or UNIX::
+You can execute SCons directly from this repository. For Linux/UNIX/MacOS::
 
     $ python scripts/scons.py [arguments]