Merge branch 'master' into jbrill-msvc-detect

Author: jcbrill

.github/workflows/experimental_tests.yml

@@ -16,7 +16,7 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  experimental:
 
     strategy:
       fail-fast: false
@@ -32,7 +32,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].6
 
       # experiment: maybe don't need this?
       # update: looks like we do: with this commented out, the build hung
@@ -44,7 +44,7 @@ jobs:
           static: 0
 
       - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: '3.11'
 

.github/workflows/framework_tests.yml

@@ -29,10 +29,10 @@ jobs:
 
     steps:
       # Checkouut repository under $GITHUB_WORKSPACE
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].6
 
       - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: '3.11'
 

.github/workflows/runtest-win.yml

@@ -0,0 +1,41 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Full Test Suite on Windows
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  runtest-win32:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/[email protected]
+
+      - name: Set up Python 3.12
+        uses: actions/[email protected]
+        with:
+          python-version: '3.12'
+
+      - name: Install dependencies including ninja
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install -r requirements-dev.txt
+
+      - name: runtest
+        run: |
+          python runtest.py --all --exclude-list=windows_ci_skip.txt --time --jobs=4
+
+      - name: Archive Failed tests
+        uses: actions/[email protected]
+        with:
+          name: windows-failed-tests
+          path: |
+            failed_tests.log

.github/workflows/runtest.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Linux Testing
+name: Full Test Suite on Linux
 
 # Controls when the workflow will run
 on:
@@ -15,25 +15,28 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-
+  # This workflow contains a single job called "runtest"
+  runtest:
     strategy:
+      fail-fast: false
       matrix:
-        os: ['ubuntu-22.04']
+        os: ['ubuntu-22.04', 'ubuntu-24.04']
 
-    # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/[email protected]
+      - uses: actions/[email protected]
+
+      - name: Install Ubuntu packages $${matrix.os}}
+        run: |
+          sudo apt-get update
+          sudo apt-get install libtirpc-dev
 
-      - name: Set up Python 3.10 ${{ matrix.os }}
-        uses: actions/setup-python@v5.0.0
+      - name: Set up Python 3.12 ${{ matrix.os }}
+        uses: actions/setup-python@v5.1.0
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - name: Install dependencies including ninja ${{ matrix.os }}
         run: |
@@ -43,10 +46,10 @@ jobs:
 
       - name: runtest ${{ matrix.os }}
         run: |
-          python runtest.py --all --time --jobs=2
+          python runtest.py --all --time --jobs=4
 
       - name: Archive Failed tests ${{ matrix.os }}
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: ${{ matrix.os }}-failed-tests
           path: |

.github/workflows/scons-package.yml

@@ -9,17 +9,17 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  package:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].6
 
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5.0.0
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5.1.0
       with:
-        python-version: '3.10'
+        python-version: '3.12'
 
     - name: Install dependencies
       run: |

CHANGES.txt

@@ -125,6 +125,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       on a given page *before* the submodule docs, not after. Also
       tweaked the Util package doc build so it's structured more like the
       other packages (a missed part of the transition when it was split).
+    - Updated manpage description of Command "builder" and function.
 
 
 RELEASE 4.7.0 -  Sun, 17 Mar 2024 17:22:20 -0700

RELEASE.txt

@@ -123,6 +123,7 @@ DOCUMENTATION
 - Update manpage and user guide for Variables usage.
 - Restructured API Docs build so main package contents are listed
   before contents of package submodules.
+- Updated manpage description of Command "builder" and function.
 
 
 

SCons/Builder.py

@@ -387,7 +387,7 @@ def __init__(self,  action = None,
                         target_scanner = None,
                         source_scanner = None,
                         emitter = None,
-                        multi: int = 0,
+                        multi: bool = False,
                         env = None,
                         single_source: bool = False,
                         name = None,

SCons/Environment.py

@@ -2208,52 +2208,44 @@ def Configure(self, *args, **kw):
         return SCons.SConf.SConf(*nargs, **nkw)
 
     def Command(self, target, source, action, **kw):
-        """Builds the supplied target files from the supplied
-        source files using the supplied action.  Action may
-        be any type that the Builder constructor will accept
-        for an action."""
+        """Set up a one-off build command.
+
+        Builds *target* from *source* using *action*, which may be
+        be any type that the Builder factory will accept for an action.
+        Generates an anonymous builder and calls it, to add the details
+        to the build graph. The builder is not named, added to ``BUILDERS``,
+        or otherwise saved.
+
+        Recognizes the :func:`~SCons.Builder.Builder` keywords
+        ``source_scanner``, ``target_scanner``, ``source_factory`` and
+        ``target_factory``.  All other arguments from *kw* are passed on
+        to the builder when it is called.
+        """
+        # Build a kwarg dict for the builder construction
         bkw = {
             'action': action,
             'target_factory': self.fs.Entry,
             'source_factory': self.fs.Entry,
         }
-        # source scanner
-        try:
-            bkw['source_scanner'] = kw['source_scanner']
-        except KeyError:
-            pass
-        else:
-            del kw['source_scanner']
-
-        # target scanner
-        try:
-            bkw['target_scanner'] = kw['target_scanner']
-        except KeyError:
-            pass
-        else:
-            del kw['target_scanner']
-
-        # source factory
-        try:
-            bkw['source_factory'] = kw['source_factory']
-        except KeyError:
-            pass
-        else:
-            del kw['source_factory']
 
-        # target factory
-        try:
-            bkw['target_factory'] = kw['target_factory']
-        except KeyError:
-            pass
-        else:
-            del kw['target_factory']
+        # Recognize these kwargs for the builder construction and take
+        # them out of the args for the subsequent builder call.
+        for arg in [
+            'source_scanner',
+            'target_scanner',
+            'source_factory',
+            'target_factory',
+        ]:
+            try:
+                bkw[arg] = kw.pop(arg)
+            except KeyError:
+                pass
 
         bld = SCons.Builder.Builder(**bkw)
         return bld(self, target, source, **kw)
 
     def Depends(self, target, dependency):
-        """Explicity specify that 'target's depend on 'dependency'."""
+        """Explicity specify that *target* depends on *dependency*."""
         tlist = self.arg2nodes(target, self.fs.Entry)
         dlist = self.arg2nodes(dependency, self.fs.Entry)
         for t in tlist:
@@ -2281,7 +2273,7 @@ def PyPackageDir(self, modulename):
         return self.fs.PyPackageDir(s)
 
     def NoClean(self, *targets):
-        """Tags a target so that it will not be cleaned by -c"""
+        """Tag target(s) so that it will not be cleaned by -c."""
         tlist = []
         for t in targets:
             tlist.extend(self.arg2nodes(t, self.fs.Entry))
@@ -2290,7 +2282,7 @@ def NoClean(self, *targets):
         return tlist
 
     def NoCache(self, *targets):
-        """Tags a target so that it will not be cached"""
+        """Tag target(s) so that it will not be cached."""
         tlist = []
         for t in targets:
             tlist.extend(self.arg2nodes(t, self.fs.Entry))