Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Whatever John Doe did.

From Joseph Brill:
- MSVS: Fix a significant MSVC/MSVC tool initialization slowdown when
vcpkg has been installed and the PSModulePath is not initialized
or propagated from the user's shell environment. To resolve this
The default Windows Powershell 7 path is added before the default
Windows Powershell 5 path in the carefully constructed
environment in which the MSVC batch files are run. The shell
environment variables and values for VCPKG_DISABLE_METRICS and
VCPKG_ROOT are added to the limited MSVC environment when defined.
At present, the VCPKG_DISABLE_METRICS and VCPKG_ROOT variables and
values are not propagated to the SCons environment after running
the MSVC batch files.
- MSVC: A significant delay was experienced in the windows 2022
runner and the windows 2025 runner when the MSVC batch files are
called during tool initialization due to the vcpkg component
installed with Visual Studio 2022. The vcpkg initialization delay
was significantly reduced in the windows 2022 and 2025 runner
environments by adding the default windows powershell 7 path
before the default powershell 5 path in the minimal environment in
which the MSVC batch files are run. Powershell 7 is known to be
installed in the windows runners. The Visual Studio vcpkg component
is not installed in the windows 2019 runner. The shell environment
variables and values for VCPKG_DISABLE_METRICS and VCPKG_ROOT are
added to the minimal environment in which the the MSVC batch files
are run. At present, the VCPKG_DISABLE_METRICS and VCPKG_ROOT
variables and values are not propagated to the SCons environment
after running the MSVC batch files.

From Bill Prendergast:
- Fixed SCons.Variables.PackageVariable to correctly test the default
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
one from PEP 308 introduced in Python 2.5 (2006). The idiom being
replaced (using and/or) is regarded as error prone.

- MSVS: The default Windows powershell 7 path is added before the default
- MSVC: The default Windows powershell 7 path is added before the default

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a blurb about the user impact. Perhaps something like.

"In some environments (such as Github Actions) this can yield a significant reduction in the time to initialize MSVC. (Without this change you may see > 10x slowdown) "

replace ##x slowdown with your best approximation of your test results.

The idea is that anyone reading this looking for a version with a fix should know from this blurb that it is indeed fixed.

RELEASE.txt is what gets sent to the mailing lists and other notification channels. Users then would have to go to the CHANGES.txt.

So RELEASE.txt should have more or less the same content as this releases CHANGE.txt blurb, but organized differently, without the attribution.

Windows powershell 5 path in the limited environment in which the
MSVC batch files are run.

Expand Down
2 changes: 0 additions & 2 deletions SCons/Tool/MSCommon/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,6 @@ def normalize_env(env, keys, force: bool=False):
return normenv




def get_output(vcbat, args=None, env=None, skip_sendtelemetry=False):
"""Parse the output of given bat file, with given args."""

Expand Down