Merge branch 'master' into jbrill-gh4312-fixplus

CHANGES.txt

@@ -68,7 +68,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
  a .py extension to open a file that is not an absolute path.
  - SCons test runner now uses pathlib to normalize and compare paths
  to test files.
- - D compilers : added support for generation of .di interface files. 
+ - D compilers : added support for generation of .di interface files.
  New variables DI_FILE_DIR, DI_FILE_DIR_PREFIX, DI_FILE_DIR_SUFFIX,
  DI_FILE_SUFFIX.
  - Fixed: when using the mingw tool, if an msys2 Python is used (os.sep
@@ -122,6 +122,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
  explicitly requested with a different base name
  than source). Docs updated. Fixes #4326 and #4327.
  - Cleaned up dblite module (checker warnings, etc.).
+ - Some cleanup in the FortranCommon tool.
+ - Changed the message about scons -H to clarify it shows built-in options.
+
+ From Jonathon Reinhart:
+ - Fix another instance of `int main()` in CheckLib() causing failures
+ when using -Wstrict-prototypes.
 
 
 RELEASE 4.5.2 - Sun, 21 Mar 2023 14:08:29 -0700

README-SF.rst

@@ -47,11 +47,9 @@ version at the SCons download page:
 Execution Requirements
 ======================
 
-Running SCons requires Python 3.5 or higher. There should be no other
-dependencies or requirements to run scons.
-
-As of SCons 4.2.0 support for Python 3.5 is deprecated and will be removed
-with the next major release.
+Running SCons requires Python 3.6 or higher. There should be no other
+dependencies or requirements to run standard SCons.
+The last release to support Python 3.5 was 4.2.0.
 
 The default SCons configuration assumes use of the Microsoft Visual C++
 compiler suite on Win32 systems, and assumes a C compiler named 'cc', a C++
@@ -399,12 +397,13 @@ following packages will be built::
  scons-doc-4.7.0ayyyymmdd.tar.gz
  scons-local-4.7.0ayyyymmdd.tar.gz
  scons-local-4.7.0ayyyymmdd.zip
+ scons-local-4.7.0ayyyymmdd.pyz
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
 packages for which you don't have the proper utilities installed.
 
-If you receive a build error, please report it to the scons-devel mailing list
-and open a bug report on the SCons bug tracker.
+If you receive a build error, please report it to the scons-users mailing list
+and open a bug report on the SCons issue tracker on GitHub.
 
 Note that in addition to creating the above packages, the default build will
 also unpack one or more of the packages for testing.
@@ -546,8 +545,9 @@ for the problem you've run into on GitHub Issues:
 Mailing Lists
 =============
 
-An active mailing list for developers of SCons is available. You may
-send questions or comments to the list at:
+In addition to the scons-users list which is appropriate for almost any
+question, there is a mailing list specifically for developers of SCons
+You may send questions or comments to the list at:
 
  scons-dev@scons.org
 
@@ -559,9 +559,11 @@ Subscription to the developer's mailing list is by approval. In practice, no
 one is refused list membership, but we reserve the right to limit membership
 in the future and/or weed out lurkers.
 
-There are other mailing lists available for SCons users, for notification of
-SCons code changes, and for notification of updated bug reports and project
-documents. Please see our mailing lists page for details.
+Note that while this list still exists, the number of different places you
+can talk about SCons means it is no longer very active. GitHub has
+support for discussions as well as for issues, and there is usually more
+immediacy on the Discord chat, so these are probably now considered the
+preferred places for "development" topics.
 
 
 Donations

README-local

@@ -43,11 +43,9 @@ scons-local package, or any SCons package, at the SCons download page:
 EXECUTION REQUIREMENTS
 ======================
 
-Running SCons requires Python 3.5 or higher.
-There should be no other dependencies or requirements to run SCons.
-
-As of SCons 4.2.0 support for Python 3.5 is deprecated and will be removed
-with the next major release.
+Running SCons requires Python 3.6 or higher. There should be no other
+dependencies or requirements to run standard SCons.
+The last release to support Python 3.5 was 4.2.0.
 
 The default SCons configuration assumes use of the Microsoft Visual C++
 compiler suite on WIN32 systems (either through the Visual Studio
@@ -84,6 +82,11 @@ Or (if, for example, you installed this package in a subdirectory named
 That should be all you have to do. (If it isn't that simple, please let
 us know!)
 
+Since 4.5, there is also an alternate form of scons-local avaialble:
+a zipapp. This is a single file with a .pyz suffix, which can be
+downloaded and executed directly (e.g.: python scons-local-4.5.2.pyz)
+without unpacking. This may be more convenient in a few cases.
+
 
 CONTENTS OF THIS PACKAGE
 ========================
@@ -191,8 +194,9 @@ You may subscribe to the scons-users mailing list at:
 
  http://two.pairlist.net/mailman/listinfo/scons-users
 
-An active mailing list for developers of SCons is available. You may
-send questions or comments to the list at:
+In addition to the scons-users list which is appropriate for almost any
+question, there is a mailing list specifically for developers of SCons
+You may send questions or comments to the list at:
 
  scons-dev@scons.org
 
@@ -204,10 +208,11 @@ Subscription to the developer's mailing list is by approval. In practice, no
 one is refused list membership, but we reserve the right to limit membership
 in the future and/or weed out lurkers.
 
-There are other mailing lists available for SCons users, for notification of
-SCons code changes, and for notification of updated bug reports and project
-documents. Please see our mailing lists page for details.
-
+Note that while this list still exists, the number of different places you
+can talk about SCons means it is no longer very active. GitHub has
+support for discussions as well as for issues, and there is usually more
+immediacy on the Discord chat, so these are probably now considered the
+preferred places for "development" topics.
 
 
 FOR MORE INFORMATION

README-package.rst

@@ -159,8 +159,9 @@ for the problem you've run into, on the
 Mailing Lists
 =============
 
-An active mailing list for developers of SCons is available. You may
-send questions or comments to the list at scons-dev@scons.org.
+In addition to the scons-users list which is appropriate for almost any
+question, there is a mailing list specifically for developers of SCons
+You may send questions or comments to the list at:
 
 You may subscribe to the developer's mailing list using the form at
 https://two.pairlist.net/mailman/listinfo/scons-dev.
@@ -169,9 +170,11 @@ Subscription to the developer's mailing list is by approval. In practice, no
 one is refused list membership, but we reserve the right to limit membership
 in the future and/or weed out lurkers.
 
-There are other mailing lists available for SCons users, for notification of
-SCons code changes, and for notification of updated bug reports and project
-documents. Please see our mailing lists page for details.
+Note that while this list still exists, the number of different places you
+can talk about SCons means it is no longer very active. GitHub has
+support for discussions as well as for issues, and there is usually more
+immediacy on the Discord chat, so these are probably now considered the
+preferred places for "development" topics.
 
 
 Donations

RELEASE.txt

@@ -16,7 +16,7 @@ Here is a summary of the changes since 4.5.2:
 NEW FUNCTIONALITY
 -----------------
 
-- D compilers : added support for generation of .di interface files. 
+- D compilers : added support for generation of .di interface files.
  New variables DI_FILE_DIR, DI_FILE_DIR_PREFIX, DI_FILE_DIR_SUFFIX,
  DI_FILE_SUFFIX.
 - MSVC: If available, native arm64 tools will be used on arm64 hosts for VS2022.
@@ -105,6 +105,7 @@ DOCUMENTATION
  if the previous *targets* parameter had been used as a keyword argument,
  the results would be incorrect (does not apply to positional argument
  usage, which had no problem).
+- Changed the message about scons -H to clarify it shows built-in options only.
 
 DEVELOPMENT
 -----------

SCons/ActionTests.py

@@ -2320,7 +2320,7 @@ def test_code_contents(self) -> None:
  b'0, 0, 0, 0,(Hello, World!),(print),(\x97\x00\x02\x00e\x00d\x00\xa6\x01\x00\x00\xab\x01\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00d\x01S\x00)'
  ),
  (3, 12): bytearray(
- b'0, 0, 0, 0,(Hello, World!),(print),(\x97\x00\x02\x00e\x00d\x00\xab\x01\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00y\x01)'
+ b'0, 0, 0, 0,(Hello, World!),(print),(\x97\x00\x02\x00e\x00d\x00\xab\x01\x00\x00\x00\x00\x00\x00\x01\x00y\x01)'
  ),
  }
 

SCons/Conftest.py

@@ -676,8 +676,7 @@ def CheckLib(context, libs, func_name = None, header = None,
 
  # if no function to test, leave main() blank
  text = text + """
-int
-main() {
+int main(void) {
  %s
 return 0;
 }

SCons/Script/Main.py

@@ -1131,7 +1131,7 @@ def _main(parser):
  raise SConsPrintHelpException
  else:
  print(help_text)
- print("Use scons -H for help about command-line options.")
+ print("Use scons -H for help about SCons built-in command-line options.")
  exit_status = 0
  return