Merge branch 'master' into jbrill-gh4320-fix

Author: bdbaddog

.github/workflows/experimental_tests.yml

@@ -32,18 +32,19 @@ 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/checkout@v2
+      - uses: actions/checkout@v4.1.1
 
       # experiment: maybe don't need this?
       # update: looks like we do: with this commented out, the build hung
       - name: Set up MinGW
-        uses: egor-tensin/setup-mingw@v2
+        uses: egor-tensin/setup-mingw@v2.2.0
         if: matrix.os == 'windows-2019'
         with:
           platform: x64
+          static: 0
 
       - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: '3.11'
 

.github/workflows/framework_tests.yml

@@ -29,10 +29,10 @@ jobs:
 
     steps:
       # Checkouut repository under $GITHUB_WORKSPACE
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4.1.1
 
       - name: Set up Python 3.11 ${{ matrix.os }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: '3.11'
 

.github/workflows/runtest.yml

@@ -28,10 +28,10 @@ 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/checkout@v2
+      - uses: actions/checkout@v4.1.1
 
       - name: Set up Python 3.10 ${{ matrix.os }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: '3.10'
 
@@ -46,7 +46,7 @@ jobs:
           python runtest.py --all --time --jobs=2
 
       - name: Archive Failed tests ${{ matrix.os }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.3
         with:
           name: ${{ matrix.os }}-failed-tests
           path: |

.github/workflows/scons-package.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.1
 
     - name: Set up Python 3.10
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5.0.0
       with:
         python-version: '3.10'
 

CHANGES.txt

@@ -17,6 +17,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix issue #4320: add an optional argument list string to configure's CheckFunc
       method so that the generated function argument list matches the function's
       prototype when including a header file.
+      
+  From William Deegan:
+    - Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
 
   From Michał Górny:
     - Remove unecessary dependencies on pypi packages from setup.cfg
@@ -26,6 +29,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       statement with stop flag enabled
 
 
+
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
 
   From Max Bachmann:

RELEASE.txt

@@ -57,10 +57,10 @@ DOCUMENTATION
 DEVELOPMENT
 -----------
 
-- List visible changes in the way SCons is developed
+- Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
 
 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.6.0..HEAD

doc/sphinx/conf.py

@@ -98,8 +98,9 @@
 # The full version, including alpha/beta/rc tags:
 release = __version__
 # The short X.Y version.
-major, minor, _ = __version__.split('.')
-version = '.'.join([major, minor])
+version_parts = __version__.split('.')
+major, minor, patch = version_parts[0:3]
+version = '.'.join([major, minor,patch])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/user/README

@@ -1,11 +1,12 @@
-# __COPYRIGHT__
+# SPDX-FileCopyrightText: Copyright The SCons Foundation (https://scons.org)
+# SPDX-License-Identifier: MIT
 
 When adding a new file, add it to main.xml and MANIFEST.
 
 To build the .xml files from the .in files:
   scons -D BUILDDOC=1 foo.xml
 To build the whole PDF doc from this dir, for testing:
-  scons -D ../../build/doc/PDF/scons-user.pdf 
+  scons -D ../../build/doc/PDF/scons-user.pdf
 
 Writing examples: here's a simple template.
 

doc/user/SConstruct

@@ -1,57 +1,36 @@
+# SPDX-FileCopyrightText: Copyright The SCons Foundation (https://scons.org)
+# SPDX-License-Identifier: MIT
 #
 # SConstruct file for building SCons documentation.
 #
 
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 import os
 
-env = Environment(ENV={'PATH' : os.environ['PATH']},
-                  tools=['docbook','gs','zip'], 
-                  toolpath=['../../SCons/Tool'],
-                  # DOCBOOK_XSLTPROCFLAGS="--stringparam  fop.extensions  1",
-                  DOCBOOK_DEFAULT_XSL_HTML='html.xsl',
-                  DOCBOOK_DEFAULT_XSL_HTMLCHUNKED='chtml.xsl',
-                  DOCBOOK_DEFAULT_XSL_PDF='pdf.xsl')
+env = Environment(
+    ENV={'PATH': os.environ['PATH']},
+    tools=['docbook', 'gs', 'zip'],
+    toolpath=['../../SCons/Tool'],
+    # DOCBOOK_XSLTPROCFLAGS="--stringparam  fop.extensions  1",
+    DOCBOOK_DEFAULT_XSL_HTML='html.xsl',
+    DOCBOOK_DEFAULT_XSL_HTMLCHUNKED='chtml.xsl',
+    DOCBOOK_DEFAULT_XSL_PDF='pdf.xsl',
+)
 
 has_pdf = False
-if (env.WhereIs('fop') or 
-    env.WhereIs('xep')):
+if env.WhereIs('fop') or env.WhereIs('xep'):
     has_pdf = True
 
 #
 # UserGuide for SCons
 #
 env.DocbookXInclude('scons_xi.xml', 'main.xml')
-env.DocbookXslt('scons_ex.xml', 'scons_xi.xml', 
-                xsl='../xslt/xinclude_examples.xslt')
+env.DocbookXslt('scons_ex.xml', 'scons_xi.xml', xsl='../xslt/xinclude_examples.xslt')
 env.DocbookXInclude('scons_exi.xml', 'scons_ex.xml')
-env.DocbookXslt('scons_db.xml', 'scons_exi.xml', 
-                xsl='../xslt/to_docbook.xslt')
-env.DocbookHtml('index.html','scons_db.xml')
+env.DocbookXslt('scons_db.xml', 'scons_exi.xml', xsl='../xslt/to_docbook.xslt')
+env.DocbookHtml('index.html', 'scons_db.xml')
 env.DocbookHtmlChunked('index.html', 'scons_db.xml', base_dir='scons-user/')
 if has_pdf:
-    env.DocbookPdf('scons-user.pdf','scons_db.xml')
+    env.DocbookPdf('scons-user.pdf', 'scons_db.xml')
 
 has_gs = False
 if env.WhereIs('gs'):
@@ -61,7 +40,10 @@ if env.WhereIs('gs'):
 # Create the EPUB format
 #
 if has_gs and has_pdf:
-    jpg = env.Gs('OEBPS/cover.jpg','scons-user.pdf', 
-                 GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -dJPEGQ=100 -r72x72 -q')
+    jpg = env.Gs(
+        'OEBPS/cover.jpg',
+        'scons-user.pdf',
+        GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -dJPEGQ=100 -r72x72 -q',
+    )
     epub = env.DocbookEpub('scons-user.epub', 'scons_db.xml', xsl='epub.xsl')
     env.Depends(epub, jpg)

doc/user/actions.xml

@@ -1,8 +1,14 @@
 <?xml version='1.0'?>
+
+<!--
+SPDX-FileCopyrightText: Copyright The SCons Foundation (https://scons.org)
+SPDX-License-Identifier: MIT
+-->
+
 <!DOCTYPE sconsdoc [
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
-    
+
     <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
     %builders-mod;
     <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
@@ -11,7 +17,7 @@
     %tools-mod;
     <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
     %variables-mod;
-    
+
 ]>
 
 <chapter id="chap-actions"
@@ -20,31 +26,6 @@
          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>&SCons; Actions</title>
 
-<!--
-
-  __COPYRIGHT__
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-  WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--->
-
 <!--
 
 =head1 Build actions