Skip to content

Commit da4d268

Browse files
committed
Temporarily restore partial GH SCons#4717 original CHANGES.txt text.
Changes: * Partially restore restore original GH SCons#4717 CHANGES.txt description * Change MSVS to MSVC in RELEASE.txt * Remove extraneous two blank lines introduced in common.py when variable moved
1 parent 6fee7f9 commit da4d268

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

CHANGES.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
1616
- Whatever John Doe did.
1717

1818
From Joseph Brill:
19-
- MSVS: Fix a significant MSVC/MSVC tool initialization slowdown when
20-
vcpkg has been installed and the PSModulePath is not initialized
21-
or propagated from the user's shell environment. To resolve this
22-
The default Windows Powershell 7 path is added before the default
23-
Windows Powershell 5 path in the carefully constructed
24-
environment in which the MSVC batch files are run. The shell
25-
environment variables and values for VCPKG_DISABLE_METRICS and
26-
VCPKG_ROOT are added to the limited MSVC environment when defined.
19+
- MSVC: The default Windows powershell 7 path is added before the
20+
default Windows powershell 5 path in the limited environment in
21+
which the MSVC batch files are run. This appears to fix a runtime
22+
issue in the windows runner environment when the embedded Visual
23+
Studio vcpkg component initializes without a PSModulePath defined.
24+
The shell environment variables and values for VCPKG_DISABLE_METRICS
25+
and VCPKG_ROOT are added to the limited MSVC environment when defined.
2726
At present, the VCPKG_DISABLE_METRICS and VCPKG_ROOT variables and
2827
values are not propagated to the SCons environment after running
2928
the MSVC batch files.

RELEASE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
3535
one from PEP 308 introduced in Python 2.5 (2006). The idiom being
3636
replaced (using and/or) is regarded as error prone.
3737

38-
- MSVS: The default Windows powershell 7 path is added before the default
38+
- MSVC: The default Windows powershell 7 path is added before the default
3939
Windows powershell 5 path in the limited environment in which the
4040
MSVC batch files are run.
4141

SCons/Tool/MSCommon/common.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,6 @@ def normalize_env(env, keys, force: bool=False):
402402
return normenv
403403

404404

405-
406-
407405
def get_output(vcbat, args=None, env=None, skip_sendtelemetry=False):
408406
"""Parse the output of given bat file, with given args."""
409407

0 commit comments

Comments
 (0)