Skip to content

Commit f97bf0b

Browse files
authored
Update SCons (#17278)
Closes #17254 Summary of the issue: We are currently on SCons version 4.5.2, which was released in March of 2023. The latest version of SCons, version 4.8.1, was released in September 2024. Description of user facing changes: None. Description of development approach * Updated the required version of SCons from 4.5.2 to 4.8.1 in `requirements.txt`. * Changed the order of arguments to `SCons.Tool.MSCommon.vc.find_vc_pdir` to that expected by SCons 4.8. * Previously, the order of arguments was `environment, version`. As of SCons 4.8, it is `version, environment`. * Changed in SCons/scons#4534 Testing strategy: Built the project locally and on Appveyor. Known issues with pull request: None.
1 parent e01caee commit f97bf0b

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

nvdaHelper/liblouis/sconscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def getLouisVersion():
5353

5454

5555
# Liblouis is build with Clang, as Microsoft Visual C++ is unable to build C99 code.
56-
clangDirs = glob.glob(os.path.join(find_vc_pdir(env, env.get("MSVC_VERSION")), r"Tools\Llvm\bin"))
56+
clangDirs = glob.glob(os.path.join(find_vc_pdir(env.get("MSVC_VERSION"), env), r"Tools\Llvm\bin"))
5757
if len(clangDirs) == 0:
5858
raise RuntimeError(
5959
"Could not find the Clang compiler. "

nvdaHelper/localWin10/sconscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ localWin10Lib = env.SharedLibrary(
4949
msvc = env.get("MSVC_VERSION")
5050
vcRedistDirs = glob.glob(
5151
os.path.join(
52-
find_vc_pdir(env, msvc), rf"Redist\MSVC\{msvc[:2]}*\x86\Microsoft.VC{msvc.replace('.', '')}.CRT"
52+
find_vc_pdir(msvc, env), rf"Redist\MSVC\{msvc[:2]}*\x86\Microsoft.VC{msvc.replace('.', '')}.CRT"
5353
)
5454
)
5555
if len(vcRedistDirs) == 0:

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# NVDA's build system is SCons
2-
SCons==4.5.2
2+
SCons==4.8.1
33

44
# NVDA's runtime dependencies
55
comtypes==1.4.6

user_docs/en/changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Add-ons will need to be re-tested and have their manifest updated.
5858
* Updated Ruff to 0.6.3. (#17102)
5959
* Updated Comtypes to 1.4.6. (#17061, @LeonarddeR)
6060
* Updated wxPython to 4.2.2. (#17181, @dpy013)
61+
* Updated SCons to 4.8.1. (#17254)
6162
* Updated sphinx to 8.1.2 and sphinx-rtd-theme to 3.0.1. (#17284, @josephsl)
6263
* `ui.browseableMessage` may now be called with options to present a button for copying to clipboard, and/or a button for closing the window. (#17018, @XLTechie)
6364
* Several additions to identify link types (#16994, @LeonarddeR, @nvdaes)

0 commit comments

Comments
 (0)