CVS commit: pkgsrc/devel/scons4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 14 13:53:16 UTC 2024

Modified Files:
        pkgsrc/devel/scons4: Makefile PLIST build.mk distinfo

Log Message:
py-scons: update to 4.8.0.

RELEASE 4.8.0 -  Sun, 07 Jul 2024 17:22:20 -0700

  From Joseph Brill:
    - For msvc version specifications without an 'Exp' suffix, an express installation
      is used when no other edition is detected for the msvc version.  Similarly, an
      express installation of the IDE binary is used when no other IDE edition is
      detected.
    - VS2015 Express (14.0Exp) does not support the sdk version argument.  VS2015 Express
      does not support the store argument for target architectures other than x86.
      Script argument validation now takes into account these restrictions.
    - VS2015 BuildTools (14.0) does not support the sdk version argument and does not
      support the store argument.  Script argument validation now takes into account
      these restrictions.
    - The Windows SDK for Windows 7 and .NET Framework 4" (SDK 7.1) populates the
      registry keys in a manner in which the msvc detection would report that VS2010
      (10.0) is installed when only the SDK was installed.  The installed files are
      intended to be used via the sdk batch file setenv.cmd. The installed msvc
      batch files will fail. The msvc detection logic now ignores SDK-only VS2010
      installations.  Similar protection is implemented for the sdk-only installs that
      populate the installation folder and registry keys for VS2008 (9.0), if necessary.
    - For VS2005 (8.0) to VS2015 (14.0), vsvarsall.bat is employed to dispatch to a
      dependent batch file when configuring the msvc environment.  Previously, only the
      existence of the compiler executable was verified. In certain installations, the
      dependent batch file (e.g., vcvars64.bat) may not exist while the compiler
      executable does exist resulting in build failures.  The existence of vcvarsall.bat,
      the dependent batch file, and the compiler executable are now validated.
    - MSVC configuration data specific to versions VS2005 (8.0) to VS2008 (9.0) was added
      as the dependent batch files have different names than the batch file names used
      for VS2010 (10.0) and later.  The VS2008 (9.0) Visual C++ For Python installation
      is handled as a special case as the dependent batch files are: (a) not used and (b)
      in different locations.
    - When VS2008 (9.0) Visual C++ For Python is installed using the ALLUSERS=1 option
      (i.e., msiexec /i VCForPython27.msi ALLUSERS=1), the registry keys are written to
      HKEY_LOCAL_MACHINE rather than HKEY_CURRENT_USER.  An entry was added to query the
      Visual C++ For Python keys in HKLM following the HKCU query, if necessary.
    - For VS2008, a full development edition (e.g., Professional) is now selected before
      a Visual C++ For Python edition.  Prior to this change, Visual C++ For Python was
      selected before a full development edition when both editions are installed.
    - The registry detection of VS2015 (14.0), and earlier, is now cached at runtime and
      is only evaluated once for each msvc version.
    - The vswhere executable is frozen upon initial detection.  Specifying a different
      vswhere executable via the construction variable VSWHERE after the initial
      detection now results in an exception.  Multiple bugs in the implementation of
      specifying a vswhere executable via the construction variable VSWHERE have been
      fixed.  Previously, when a user specified vswhere executable detects new msvc
      installations after the initial detection, the internal msvc installation cache
      and the default msvc version based on the initial detection are no longer valid.
      For example, when no vswhere executable is found for the initial detection
      and then later an environment is constructed with a user specified vswhere
      executable that detects new msvc installations.
    - The vswhere detection of VS2017 (14.1), and later, is now cached at runtime and is
      only evaluated once using a single vswhere invocation for all msvc versions.
      Previously, the vswhere executable was invoked for each supported msvc version.
    - The vswhere executable locations for the WinGet and Scoop package managers were
      added to the default vswhere executable search list after the Chocolatey
      installation location.
    - Fix issue #4543: add support for msvc toolset versions 14.4X installed as the
      latest msvc toolset versions for msvc buildtools v143.  The v143 msvc buildtools
      may contain msvc toolset versions from 14.30 to 14.4X.

  From Thaddeus Crews:
    - GetSConsVersion() to grab the latest SCons version without needing to
      access SCons internals.
    - Migrate setup.cfg logic to pyproject.toml; remove setup.cfg.
    - Update .gitattributes to match .editorconfig; enforce eol settings.
    - Replace black/flake8 with ruff for more efficient formatting & linting.
    - When debugging (--debug=pdb), the filename SCsub is now recognized when
      manipulating breakpoints.

  From Raymond Li:
    - Fix issue #3935: OSErrors are now no longer hidden during execution of
      Actions. All exceptions during the execution of an Action are now
      returned by value rather than by raising an exception, for more
      consistent behavior.
      NOTE: With this change, user created Actions should now catch and handle
      expected exceptions (whereas previously many of these were silently
      caught and suppressed by the SCons Action exection code).

  From Ryan Carsten Schmidt:
    - Teach ParseFlags to put a --stdlib=libname argument into CXXFLAGS.
      If placed in CCFLAGS (the default location), it could be fed to the
      C compiler (gcc, clang) where it is not applicable and causes a
      warning message.

  From Mats Wichmann:
    - Updated Value Node docs and tests.
    - Python 3.13 compat: re.sub deprecated count, flags as positional args,
      caused update-release-info test to fail.
    - Dump() with json format selected now recognizes additional compound types
      (UserDict and UserList), which improves the detail of the display.
      json output is also sorted, to match the default display.
    - Python 3.13 (alpha) changes the behavior of isabs() on Windows. Adjust
      SCons usage of in NodeInfo classes to match.  Fixes #4502, #4504.
    - Drop duplicated __getstate__ and __setstate__ methods in AliasNodeInfo,
      FileNodeInfo and ValueNodeInfo classes, as they are identical to the
      ones in parent NodeInfoBase and can just be inherited.
    - Update manpage for Tools, and for TOOL, which also gets a minor
      tweak for how it's handled (should be more accurate in a few situations).
    - Test framework now uses a subdirectory named "scons" below the base
      temporary directory. This gives something invariant to tell antivirus
      to ignore without having to exclude tmpdir itself. Fixes #4509.
    - MSVS "live" tests of project files adjusted to look for the generated
      executable with an exe sufffix
    - Documentation build now properly passes through skipping the PDF
      (and EPUB) builds of manpage and user guide; this can also be done
      manually if directly calling doc/man/SConstruct and doc/user/SConstruct
      by adding SKIP_PDF=1.  This should help with distro packaging of SCons,
      which now does not need "fop" and other tools to be set up in order to
      build pdf versions which are then ignored.
    - Add the ability to print a Variables object for debugging purposes
      (provides a __str__ method in the class).
    - Mark Python 3.6 support as deprecated.
    - Clean up Variables: more consistently call them variables (finish the
      old change from Options) in docstrings, etc.; some typing and other
      tweaks.  Update manpage and user guide for Variables usage.
    - Regularize internal usage of Python version strings and drop one
      old Python 2-only code block in a test.
    - scons-time tests now supply a "filter" argument to tarfile.extract
      to quiet a warning which was added in Python 3.13 beta 1.
    - Improved the conversion of a "foreign" exception from an action
      into BuildError by making sure our defaults get applied even in
      corner cases. Fixes #4530.
    - Restructured API docs build (Sphinx) so main module contents appear
      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.
    - Framework for scons-time tests adjusted so a path with a long username
      Windows has squashed doesn't get re-expanded. Fixes a problem seen
      on GitHub Windows runner which uses a name "runneradmin".
    - SCons.Environment.is_valid_construction_var() now returns a boolean to
      match the convention that functions beginning with "is" have yes/no
      answers (previously returned either None or an re.match object).
      Now matches the annotation and docstring (which were prematurely
      updated in 4.6). All SCons usage except unit test was already fully
      consistent with a bool.
    - When a variable is added to a Variables object, it can now be flagged
      as "don't perform substitution" by setting the argument subst.
      This allows variables to contain characters which would otherwise
      cause expansion. Fixes #4241.
    - The test runner now recognizes the unittest module's return code of 5,
      which means no tests were run. SCons/Script/MainTests.py currently
      has no tests, so this particular error code is expected - should not
      cause runtest to give up with an "unknown error code".
    - Updated the notes about reproducible builds with SCons and the example.
    - The Clone() method now respects the variables argument (fixes #3590)
    - is_valid_construction_var() (not part of the public API) moved from
      SCons.Environment to SCons.Util to avoid the chance of import loops. Variables
      and Environment both use the routine and Environment() uses a Variables()
      object so better to move to a safer location.
    - Performance tweak: the __setitem__ method of an Environment, used for
      setting construction variables, now uses the string method isidentifier
      to validate the name (updated from microbenchmark results).
    - AddOption and the internal add_local_option which AddOption calls now
      recognize a "settable" keyword argument to indicate a project-added
      option can also be modified using SetOption. Fixes #3983.
      NOTE: If you were using ninja and using SetOption() for ninja options
      in your SConscripts prior to loading the ninja tool, you will now
      see an error. The fix is to move the SetOption() to after you've loaded
      the ninja tool.
    - ListVariable now has a separate validator, with the functionality
      that was previously part of the converter. The main effect is to
      allow a developer to supply a custom validator, which previously
      could be inhibited by the converter failing before the validator
      is reached.
    - Regularized header (copyright, licens) at top of documentation files
      using SPDX.
    - Updated introductory section of manual page.
    - Minor cleanups in tests - drop unused "% locals()" stanzas.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/scons4/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/scons4/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/scons4/build.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/scons4/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/scons4/Makefile
diff -u pkgsrc/devel/scons4/Makefile:1.8 pkgsrc/devel/scons4/Makefile:1.9
--- pkgsrc/devel/scons4/Makefile:1.8    Sat Apr  6 06:32:56 2024
+++ pkgsrc/devel/scons4/Makefile        Sun Jul 14 13:53:16 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2024/04/06 06:32:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2024/07/14 13:53:16 wiz Exp $
 
-DISTNAME=      SCons-4.7.0
+DISTNAME=      scons-4.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=    devel python
-MASTER_SITES=  ${MASTER_SITE_PYPI:=S/SCons/}
+MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scons/}
 EXTRACT_USING= bsdtar
 
 MAINTAINER=    gdt%NetBSD.org@localhost
@@ -22,6 +22,9 @@ REPLACE_PYTHON+=      script/sconsign
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/sc/SC/}
+WHEEL_NAME=    ${DISTNAME:S/sc/SC/}
+
 # XXX: not sure why this is needed exactly
 # but -Wl,-rpath is filtered out by buildlink from the c++ command line
 SUBST_CLASSES+=                rflag
@@ -35,9 +38,9 @@ post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} scons scons-${PYVERSSUFFIX}
        cd ${DESTDIR}${PREFIX}/bin && ${MV} scons-configure-cache scons-configure-cache-${PYVERSSUFFIX}
        cd ${DESTDIR}${PREFIX}/bin && ${MV} sconsign sconsign-${PYVERSSUFFIX}
-       cd ${DESTDIR}${PREFIX} && ${MV} scons.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scons-${PYVERSSUFFIX}.1
-       cd ${DESTDIR}${PREFIX} && ${MV} scons-time.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scons-time-${PYVERSSUFFIX}.1
-       cd ${DESTDIR}${PREFIX} && ${MV} sconsign.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sconsign-${PYVERSSUFFIX}.1
+       ${INSTALL_DATA} ${WRKSRC}/scons.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scons-${PYVERSSUFFIX}.1
+       ${INSTALL_DATA} ${WRKSRC}/scons-time.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scons-time-${PYVERSSUFFIX}.1
+       ${INSTALL_DATA} ${WRKSRC}/sconsign.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sconsign-${PYVERSSUFFIX}.1
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"

Index: pkgsrc/devel/scons4/PLIST
diff -u pkgsrc/devel/scons4/PLIST:1.3 pkgsrc/devel/scons4/PLIST:1.4
--- pkgsrc/devel/scons4/PLIST:1.3       Sat Apr  6 06:32:56 2024
+++ pkgsrc/devel/scons4/PLIST   Sun Jul 14 13:53:16 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/04/06 06:32:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/07/14 13:53:16 wiz Exp $
 bin/scons-${PYVERSSUFFIX}
 bin/scons-configure-cache-${PYVERSSUFFIX}
 bin/sconsign-${PYVERSSUFFIX}
@@ -185,6 +185,9 @@ ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Di
 ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Exceptions.py
 ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Exceptions.pyc
 ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Exceptions.pyo
+${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Kind.py
+${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Kind.pyc
+${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Kind.pyo
 ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Policy.py
 ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Policy.pyc
 ${PYSITELIB}/SCons/Tool/MSCommon/MSVC/Policy.pyo

Index: pkgsrc/devel/scons4/build.mk
diff -u pkgsrc/devel/scons4/build.mk:1.7 pkgsrc/devel/scons4/build.mk:1.8
--- pkgsrc/devel/scons4/build.mk:1.7    Fri Apr 19 11:46:29 2024
+++ pkgsrc/devel/scons4/build.mk        Sun Jul 14 13:53:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.7 2024/04/19 11:46:29 nia Exp $
+# $NetBSD: build.mk,v 1.8 2024/07/14 13:53:16 wiz Exp $
 #
 # This Makefile fragment supports building using the SCons build tool.
 #
@@ -60,9 +60,9 @@ scons-test:
 .if ${SCONS_DO_INSTALL} == "yes"
 do-install: scons-install
 scons-install:
-.for d in ${INSTALL_DIRS}
+.  for d in ${INSTALL_DIRS}
        cd ${WRKSRC} && cd ${d} && ${SETENV} ${INSTALL_ENV} ${SCONSBIN} ${_SCONS_INSTALL_ARGS} ${INSTALL_TARGET}
-.endfor
+.  endfor
 .endif
 
 _VARGROUPS+=           scons

Index: pkgsrc/devel/scons4/distinfo
diff -u pkgsrc/devel/scons4/distinfo:1.4 pkgsrc/devel/scons4/distinfo:1.5
--- pkgsrc/devel/scons4/distinfo:1.4    Sat Apr  6 06:32:56 2024
+++ pkgsrc/devel/scons4/distinfo        Sun Jul 14 13:53:16 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2024/04/06 06:32:56 wiz Exp $
+$NetBSD: distinfo,v 1.5 2024/07/14 13:53:16 wiz Exp $
 
-BLAKE2s (SCons-4.7.0.tar.gz) = ed80366b527710b811653fd84e923a7298189562405d43996a18d10433e84cb5
-SHA512 (SCons-4.7.0.tar.gz) = 4d607114eb4ed91a33bb86f07af8d60f89d55402752ca524ad79a5af8bd73cbc0d4e3490894200c71fe5fb62fb35558a3f9edbd1b03f134592c52de7ab146730
-Size (SCons-4.7.0.tar.gz) = 3220727 bytes
+BLAKE2s (scons-4.8.0.tar.gz) = 23513ac1737b4d7b1b9ca0b6498c6406c1de80681ee0295484656c882eca296d
+SHA512 (scons-4.8.0.tar.gz) = 44e6eefaf76cf8eff5be7654ef22e58113c18d7580f433dca0767a4590f0b9692c95fc887d4db69f407db3f013e236acabf743195bf95580e9518a2e896576de
+Size (scons-4.8.0.tar.gz) = 3243129 bytes
 SHA1 (patch-SCons_Platform_____init____.py) = 944c044beea35d47f144a6a4ab8fe77e28aaf706