Merge pull request SCons#4497 from SCons/rel_4.7.0

Rel 4.7.0

Author: bdbaddog

CHANGES.txt

@@ -7,7 +7,7 @@
 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.7.0 -  Sun, 17 Mar 2024 17:22:20 -0700
 
   From Ataf Fazledin Ahamed:
     - Use of NotImplemented instead of NotImplementedError for special methods
@@ -52,7 +52,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - 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
+    - Remove unnecessary dependencies on pypi packages from setup.cfg
 
   From Sten Grüner:
     - Fix of the --debug=sconscript option to return exist statements when using return
@@ -112,7 +112,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Add locking around creation of CacheDir config file. Fixes #4489.
     - Clarify MergeFlags usage of a dict argument.
     - SCons documentation build can now be controlled through SKIP_DOC
-      variable - rather than just true/false can now specifiy
+      variable - rather than just true/false can now specify
       skip none, skip all, skip pdf docs, skip api docs.
 
 

README-SF.rst

@@ -134,7 +134,7 @@ By default, the above commands will do the following:
 - Install scripts named "scons" and "sconsign" scripts in the default system
   script directory (/usr/bin or C:\\Python\*\\Scripts, for example).
 
-- Install "scons-4.5.1.exe" and "scons.exe" executables in the Python
+- Install "scons-4.7.0.exe" and "scons.exe" executables in the Python
   prefix directory on Windows (C:\\Python\*, for example).
 
 - Install the SCons build engine (a Python module) in the standard Python library directory
@@ -391,7 +391,7 @@ about `Executing SCons Without Installing`_)::
 Depending on the utilities installed on your system, any or all of the
 following packages will be built::
 
-    SCons-4.5.1-py3-none-any.whl
+    SCons-4.7.0-py3-none-any.whl
     SCons-4.7.0ayyyymmdd.tar.gz
     SCons-4.7.0ayyyymmdd.zip
     scons-doc-4.7.0ayyyymmdd.tar.gz

README-package.rst

@@ -192,5 +192,5 @@ For More Information
 Check the SCons web site at https://www.scons.org/
 
 
-Copyright (c) 2001 - 2021 The SCons Foundation
+Copyright (c) 2001 - 2024 The SCons Foundation
 

README.rst

@@ -299,4 +299,4 @@ many contributors, including but not at all limited to:
 
 \... and many others.
 
-Copyright (c) 2001 - 2021 The SCons Foundation
+Copyright (c) 2001 - 2024 The SCons Foundation

RELEASE.txt

@@ -1,16 +1,7 @@
-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.6.1, is now available on the SCons download page:
+A new SCons release, 4.7.0, is now available on the SCons download page:
 
     https://scons.org/pages/download.html
 
-
 Here is a summary of the changes since 4.6.0:
 
 NEW FUNCTIONALITY
@@ -20,12 +11,6 @@ NEW FUNCTIONALITY
   from a specified directory.  An attempt to unlink a file is made only when the
   file exists; otherwise, the file is ignored.
 
-
-DEPRECATED FUNCTIONALITY
-------------------------
-
-- List anything that's been deprecated since the last release
-
 CHANGED/ENHANCED EXISTING FUNCTIONALITY
 ---------------------------------------
 
@@ -64,7 +49,6 @@ FIXES
   now returns None.
 - Add locking around creation of CacheDir config file. Fixes issue #4489.
 
-
 IMPROVEMENTS
 ------------
 
@@ -83,13 +67,12 @@ IMPROVEMENTS
 - Dumping an environment with `json` formatting will now explicitly specify if a given
   value cannot be serialized.
 
-
 PACKAGING
 ---------
 
-- Remove unecessary dependencies on pypi packages from setup.cfg
+- Remove unnecessary dependencies on pypi packages from setup.cfg
 - SCons documentation build can now be controlled through SKIP_DOC
-  variable - rather than just true/false can now specifiy
+  variable - rather than just true/false can now specify
   skip none, skip all, skip pdf docs, skip api docs.
 
 DOCUMENTATION
@@ -108,8 +91,6 @@ DOCUMENTATION
 - Clarify how SCons finds the project top directory, and what that is used for.
 - Clarify MergeFlags usage of a dict argument.
 
-
-
 DEVELOPMENT
 -----------
 
@@ -122,3 +103,13 @@ Thanks to the following contributors listed below for their contributions to thi
 .. code-block:: text
 
     git shortlog --no-merges -ns 4.6.0..HEAD
+    26  Andrew Morrow
+    24  Mats Wichmann
+    14  William Deegan
+     7  Joseph Brill
+     6  StenGruener
+     3  Prabhu S. Khalsa
+     3  Thaddeus Crews
+     2  fazledyn-or
+     1  Michał Górny
+     1  Piotr Siupa

SCons/__init__.py

@@ -1,9 +1,9 @@
-__version__="4.6.1"
-__copyright__="Copyright (c) 2001 - 2023 The SCons Foundation"
+__version__="4.7.0"
+__copyright__="Copyright (c) 2001 - 2024 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="Sun, 19 Nov 2023 17:54:10 -0700"
+__date__="Sun, 17 Mar 2024 17:33:54 -0700"
 __buildsys__="M1Dog2021"
-__revision__="70bcde6f38478a85a552ee624baaa2beb7b2bb92"
-__build__="70bcde6f38478a85a552ee624baaa2beb7b2bb92"
+__revision__="265be6883fadbb5a545612265acc919595158366"
+__build__="265be6883fadbb5a545612265acc919595158366"
 # 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.6.1'
+default_version = '4.7.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

@@ -2216,13 +2216,24 @@ env.RPCGenClient('src/rpcif.x')
     <term><replaceable>env</replaceable>.<methodname>SharedLibrary</methodname>()</term>
     <listitem><para>
 Builds a shared library
-(<filename>.so</filename> on a POSIX system,
-<filename>.dll</filename> on Windows)
 given one or more object files
-or C, C++, D or Fortran source files.
-If any source files are given,
-then they will be automatically
-compiled to object files.
+and/or C, C++, D or Fortran source files.
+Any source files listed in the
+<parameter>source</parameter> parameter
+will be automatically
+compiled to object files suitable
+for use in a shared library.
+Any object files listed in the
+<parameter>source</parameter> parameter
+must have been built for a shared library
+(that is, using the
+&b-SharedObject;
+builder method).
+&scons;
+will raise an error if there is any mismatch.
+</para>
+
+<para>
 The target library file prefix,
 specified by the &cv-link-SHLIBPREFIX; &consvar;
 (by default, <filename>lib</filename> on POSIX systems,
@@ -2231,7 +2242,13 @@ and suffix,
 specified by the &cv-link-SHLIBSUFFIX; &consvar;
 (by default, <filename>.dll</filename> on Windows systems,
 <filename>.so</filename> on POSIX systems),
-are automatically added to the target if not already present.
+are automatically added (if not already present)
+to the target name to make up the library filename.
+On a POSIX system, if the &cv-link-SHLIBVERSION; &consvar; is set,
+it is appended (following a period) to the resulting library name.
+</para>
+
+<para>
 Example:
 </para>
 
@@ -2261,16 +2278,6 @@ if there is not already a <filename>.dll.a</filename> file explicitly
 listed in the targets.
 </para>
 
-<para>
-Any object files listed in the
-<parameter>source</parameter>
-must have been built for a shared library
-(that is, using the
-&b-SharedObject;
-builder method).
-&scons;
-will raise an error if there is any mismatch.
-</para>
 
 <para>
 On some platforms, there is a distinction between a shared library
@@ -2280,7 +2287,7 @@ For maximum portability, use the &b-link-LoadableModule; builder for the latter.
 </para>
 
 <para>
-When the &cv-link-SHLIBVERSION; &consvar; is defined, a versioned
+If &cv-link-SHLIBVERSION; is defined, a versioned
 shared library is created. This modifies &cv-link-SHLINKFLAGS; as required,
 adds the version number to the library name, and creates any
 symbolic links that are needed.
@@ -2291,17 +2298,25 @@ env.SharedLibrary(target='bar', source=['bar.c', 'foo.o'], SHLIBVERSION='1.5.2')
 </example_commands>
 
 <para>
-On a POSIX system, versions with a single token create exactly one symlink:
-<filename>libbar.so.6</filename> would have symlink <filename>libbar.so</filename> only.
-On a POSIX system, versions with two or more
-tokens create exactly two symlinks: <filename>libbar.so.2.3.1</filename> would have symlinks
-<filename>libbar.so</filename> and <filename>libbar.so.2</filename>; on a Darwin (OSX) system the library would be
-<filename>libbar.2.3.1.dylib</filename> and the link would be <filename>libbar.dylib</filename>.
+On a POSIX system, supplying a simple version string (no dots)
+creates exactly one symbolic link: <literal>SHLIBVERSION="1"</literal>
+would create (for example) library <filename>libbar.so.1</filename>
+and symbolic link <filename>libbar.so</filename>.
+Supplying a dotted version string will create two symbolic links
+(irrespective of the number of segments in the version):
+<literal>SHLIBVERSION="1.5.2"</literal> for the same library
+would create library <filename>libbar.so.1.5.2</filename>
+and symbolic links <filename>libbar.so</filename> and
+<filename>libbar.so.1</filename>. A Darwin (OSX)
+system creates one symlink in either case,
+for the second example the library would be
+<filename>libbar.1.5.2.dylib</filename>
+and the link would be <filename>libbar.dylib</filename>.
 </para>
 
 <para>
-On Windows systems, specifying
-<parameter>register=1</parameter>
+On Windows systems, specifying the
+<parameter>register=1</parameter> keyword argument
 will cause the <filename>.dll</filename> to be
 registered after it is built.
 The command that is run is determined by the &cv-link-REGSVR; &consvar;

doc/generated/examples/caching_ex-random_1.xml

@@ -2,7 +2,7 @@
 cc -o f3.o -c f3.c
 cc -o f5.o -c f5.c
 cc -o f4.o -c f4.c
-cc -o f2.o -c f2.c
 cc -o f1.o -c f1.c
+cc -o f2.o -c f2.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>

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/mwichmann/scripts/scons.py", line 97, in <module>
+File "/Users/bdbaddog/devel/scons/git/as_scons/scripts/scons.py", line 97, in <module>
 </screen>