Skip to content

Commit 85ef944

Browse files
gengjiawenTrott
authored andcommitted
win: change to use Python in install tool
PR-URL: #31221 Reviewed-By: David Carlier <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Christian Clauss <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent b3b0ae5 commit 85ef944

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tools/msvs/install_tools/install_tools.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ echo result of a Chocolatey install. This acceptance occurs whether you know the
3838
echo license terms or not. Read and understand the license terms of the packages
3939
echo being installed and their dependencies prior to installation:
4040
echo - https://chocolatey.org/packages/chocolatey
41-
echo - https://chocolatey.org/packages/python2
41+
echo - https://chocolatey.org/packages/python
4242
echo - https://chocolatey.org/packages/visualstudio2017-workload-vctools
4343
echo.
4444
echo This script is provided AS-IS without any warranties of any kind
@@ -52,4 +52,4 @@ pause
5252

5353
cls
5454

55-
"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command Start-Process '%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe' -ArgumentList '-NoProfile -InputFormat None -ExecutionPolicy Bypass -Command iex ((New-Object System.Net.WebClient).DownloadString(''https://chocolatey.org/install.ps1'')); choco upgrade -y python2 visualstudio2017-workload-vctools; Read-Host ''Type ENTER to exit'' ' -Verb RunAs
55+
"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command Start-Process '%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe' -ArgumentList '-NoProfile -InputFormat None -ExecutionPolicy Bypass -Command iex ((New-Object System.Net.WebClient).DownloadString(''https://chocolatey.org/install.ps1'')); choco upgrade -y python visualstudio2017-workload-vctools; Read-Host ''Type ENTER to exit'' ' -Verb RunAs

tools/msvs/msi/i18n/en-us.wxl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<String Id="NativeToolsDlgTitle">{\WixUI_Font_Title}Tools for Native Modules</String>
1313
<String Id="NativeToolsDlgDescription">Optionally install the tools necessary to compile native modules.</String>
1414
<String Id="NativeToolsDlgBannerBitmap">WixUI_Bmp_Banner</String>
15-
<String Id="NativeToolsDlgIntro">Some npm modules need to be compiled from C/C++ when installing. If you want to be able to install such modules, some tools (Python 2 and Visual Studio Build Tools) need to be installed.</String>
15+
<String Id="NativeToolsDlgIntro">Some npm modules need to be compiled from C/C++ when installing. If you want to be able to install such modules, some tools (Python and Visual Studio Build Tools) need to be installed.</String>
1616
<String Id="NativeToolsDlgInstallCheckbox">Automatically install the necessary tools. Note that this will also install Chocolatey. The script will pop-up in a new window after the installation completes.</String>
1717
<String Id="NativeToolsDlgManualDetails">Alternatively, follow the instructions at <![CDATA[<a href="https://github.com./nodejs/node-gyp#on-windows">https://github.com./nodejs/node-gyp#on-windows</a>]]> to install the dependencies yourself.</String>
1818

0 commit comments

Comments
 (0)