Rel 4.6.0

CHANGES.txt

@@ -7,7 +7,8 @@
 NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported
 
-RELEASE  VERSION/DATE TO BE FILLED IN LATER
+RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
+
   From Max Bachmann:
     - Add missing directories to searched paths for mingw installs
 
@@ -85,6 +86,10 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       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,..)
 
+  From Jonathon Reinhart:
+    - Fix another instance of `int main()` in CheckLib() causing failures
+      when using -Wstrict-prototypes.
+
   From Mats Wichmann
     - C scanner's dictifyCPPDEFINES routine did not understand the possible
       combinations of CPPDEFINES - not aware of a "name=value" string either
@@ -215,10 +220,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       GNU linker, the ':' in '-l:libfoo.a'). Fixes Github issue #3951.
     - Update PCH builder docs with some usage notes.
 
-  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
 
   From Michał Górny:

RELEASE.txt

@@ -1,12 +1,4 @@
-If you are reading this in the git repository, the contents
-refer to *unreleased* changes since the last SCons release.
-Past official release announcements appear at:
-
-    https://scons.org/tag/releases.html
-
-==================================================================
-
-A new SCons release, 4.5.3, is now available on the SCons download page:
+A new SCons release, 4.6.0, is now available on the SCons download page:
 
     https://scons.org/pages/download.html
 
@@ -27,10 +19,6 @@ NEW FUNCTIONALITY
   prefix for considering a library argument unmodified (e.g. for the
   GNU linker, the ':' in '-l:libfoo.a'). Fixes Github issue #3951.
 
-DEPRECATED FUNCTIONALITY
-------------------------
-
-- List anything that's been deprecated since the last release
 
 CHANGED/ENHANCED EXISTING FUNCTIONALITY
 ---------------------------------------
@@ -181,3 +169,14 @@ Thanks to the following contributors listed below for their contributions to thi
 .. code-block:: text
 
     git shortlog --no-merges -ns 4.5.2..HEAD
+        97  Mats Wichmann
+        39  William Deegan
+        20  Joseph Brill
+        12  Alex Burton
+         4  StenGruener
+         2  Jonathon Reinhart
+         2  LiuYinCarl
+         2  Max Bachmann
+         1  Kenshin
+         1  Shohei YOSHIDA
+         1  Vitaly Cheptsov

ReleaseConfig

@@ -31,7 +31,7 @@
 # If the release type is not 'final', the patchlevel is set to the
 # release date.  This value is mandatory and must be present in this file.
 #version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (4, 5, 3, 'a', 0)
+version_tuple = (4,6,0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version

SCons/__init__.py

@@ -1,9 +1,9 @@
-__version__="4.5.3"
+__version__="4.6.0"
 __copyright__="Copyright (c) 2001 - 2023 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="Sat, 28 Oct 2023 17:40:01 -0700"
+__date__="Sun, 19 Nov 2023 17:22:20 -0700"
 __buildsys__="M1Dog2021"
-__revision__="a790daf8d878aef83937723e1fb1017fd86875f2"
-__build__="a790daf8d878aef83937723e1fb1017fd86875f2"
+__revision__="e5eef322a4a727b96358a436dca46e8085ac8692"
+__build__="e5eef322a4a727b96358a436dca46e8085ac8692"
 # make sure compatibility is always in place
 import SCons.compat  # noqa

SConstruct

@@ -36,7 +36,7 @@ copyright_years = strftime('2001 - %Y')
 # This gets inserted into the man pages to reflect the month of release.
 month_year = strftime('%B %Y')
 project = 'scons'
-default_version = '4.5.3'
+default_version = '4.6.0'
 copyright = f"Copyright (c) {copyright_years} The SCons Foundation"
 
 # We let the presence or absence of various utilities determine whether

doc/generated/builders.gen

@@ -27,10 +27,12 @@ Example:
 
 <example_commands>
 # builds foo.c
-env.CFile(target = 'foo.c', source = 'foo.l')
+env.CFile(target='foo.c', source='foo.l')
+
 # builds bar.c
-env.CFile(target = 'bar', source = 'bar.y')
+env.CFile(target='bar', source='bar.y')
 </example_commands>
+
 </listitem>
   </varlistentry>
   <varlistentry id="b-Command">
@@ -124,10 +126,12 @@ Example:
 
 <example_commands>
 # builds foo.cc
-env.CXXFile(target = 'foo.cc', source = 'foo.ll')
+env.CXXFile(target='foo.cc', source='foo.ll')
+
 # builds bar.cc
-env.CXXFile(target = 'bar', source = 'bar.yy')
+env.CXXFile(target='bar', source='bar.yy')
 </example_commands>
+
 </listitem>
   </varlistentry>
   <varlistentry id="b-DocbookEpub">
@@ -1535,10 +1539,9 @@ the top directory of the project.
     <listitem><para>
 Builds a Microsoft Visual C++ precompiled header.
 Calling this builder
-returns a list of two targets: the PCH as the first element, and the object
-file as the second element. Normally the object file is ignored.
-This builder is only
-provided when Microsoft Visual C++ is being used as the compiler.
+returns a list of two target nodes: the PCH as the first element,
+and the object file as the second element.
+Normally the object file is ignored.
 The &b-PCH; builder is generally used in
 conjunction with the &cv-link-PCH; &consvar; to force object files to use
 the precompiled header:
@@ -1547,6 +1550,42 @@ the precompiled header:
 <example_commands>
 env['PCH'] = env.PCH('StdAfx.cpp')[0]
 </example_commands>
+
+<note>
+<para>
+This builder is specific to the PCH implementation
+in  Microsoft Visual C++.
+Other compiler chains also implement precompiled header support,
+but &b-PCH; does not work with them at this time.
+As a result, the builder is only generated into the
+construction environment when
+Microsoft Visual C++ is being used as the compiler.
+</para>
+<para>
+The builder only works correctly in a C++ project.
+The Microsoft implementation distinguishes between
+precompiled headers from C and C++.
+Use of the builder will cause the PCH generation to happen with a flag
+that tells <application>cl.exe</application> all of the
+files are C++ files; if that PCH file is then supplied when
+compiling a C source file,
+<application>cl.exe</application> will fail the build with
+a compatibility violation.
+</para>
+<para>
+If possible, arrange the project so that a
+C++ source file passed to the &b-PCH; builder
+is not also included in the list of sources
+to be otherwise compiled in the project.
+&SCons; will correctly track that file in the dependency tree
+as a result of the &b-PCH; call,
+and (for MSVC 11.0 and greater) automatically add the
+corresponding object file to the link line.
+If the source list is automatically generated,
+for example using the &f-link-Glob; function,
+it may be necessary to remove that file from the list.
+</para>
+</note>
 </listitem>
   </varlistentry>
   <varlistentry id="b-PDF">

doc/generated/examples/caching_ex-random_1.xml

@@ -1,8 +1,8 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f4.o -c f4.c
 cc -o f2.o -c f2.c
-cc -o f1.o -c f1.c
-cc -o f5.o -c f5.c
 cc -o f3.o -c f3.c
+cc -o f5.o -c f5.c
+cc -o f1.o -c f1.c
+cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>

doc/generated/examples/commandline_EnumVariable_3.xml

@@ -4,5 +4,5 @@ COLOR: Set background color (red|green|blue)
     default: red
     actual: red
 
-Use scons -H for help about command-line options.
+Use scons -H for help about SCons built-in command-line options.
 </screen>

doc/generated/examples/commandline_Variables_Help_1.xml

@@ -4,5 +4,5 @@ RELEASE: Set to 1 to build for release
     default: 0
     actual: 0
 
-Use scons -H for help about command-line options.
+Use scons -H for help about SCons built-in command-line options.
 </screen>

doc/generated/examples/output_ex1_1.xml

@@ -5,5 +5,5 @@ scons: done reading SConscript files.
 Type: 'scons program' to build the production program,
       'scons debug' to build the debug version.
 
-Use scons -H for help about command-line options.
+Use scons -H for help about SCons built-in command-line options.
 </screen>

doc/generated/examples/output_ex2_1.xml

@@ -6,5 +6,5 @@ Type: 'scons program' to build the production program.
 
 Type: 'scons windebug' to build the Windows debug version.
 
-Use scons -H for help about command-line options.
+Use scons -H for help about SCons built-in command-line options.
 </screen>

doc/generated/examples/output_ex2_2.xml

@@ -4,5 +4,5 @@ scons: done reading SConscript files.
 
 Type: 'scons program' to build the production program.
 
-Use scons -H for help about command-line options.
+Use scons -H for help about SCons built-in command-line options.
 </screen>

doc/generated/examples/troubleshoot_Dump_1.xml

@@ -36,6 +36,7 @@ scons: Reading SConscript files ...
   'IDLSUFFIXES': ['.idl', '.IDL'],
   'INSTALL': <function copyFunc at 0x700000>,
   'INSTALLVERSIONEDLIB': <function copyFuncVersionedLib at 0x700000>,
+  'LIBLITERALPREFIX': '',
   'LIBPREFIX': 'lib',
   'LIBPREFIXES': ['$LIBPREFIX'],
   'LIBSUFFIX': '.a',

doc/generated/examples/troubleshoot_Dump_2.xml

@@ -61,6 +61,7 @@ scons: Reading SConscript files ...
   'INSTALL': <function copyFunc at 0x700000>,
   'INSTALLVERSIONEDLIB': <function copyFuncVersionedLib at 0x700000>,
   'LEXUNISTD': ['--nounistd'],
+  'LIBLITERALPREFIX': '',
   'LIBPREFIX': '',
   'LIBPREFIXES': ['$LIBPREFIX'],
   'LIBSUFFIX': '.lib',

doc/generated/examples/troubleshoot_explain1_3.xml

@@ -2,5 +2,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/scons-2/scripts/scons.py", line 97, in <module>
+File "/Users/bdbaddog/devel/scons/git/as_scons/scripts/scons.py", line 97, in <module>
 </screen>