From 469473d5501e922e3b094429f732617cd107e922 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 13 Nov 2018 14:48:52 -0500 Subject: [PATCH] Revert "win,msi: install tools for native modules" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts: Revision: 257a5e9c389b648aca08b02aae9e19f142ce0493 win: add prompt to tools installation script Revision: e9a291582d145a00df27aaaa54b66e42c725d89e win: clarify Boxstarter behavior on install tools Revision: 3b895d12584a91acf3866a728ed490841490dc95 win,msi: display license notes before installing tools Revision: cf284c80a9c82d4baebf095c356179c753da493c win,msi: install Boxstarter from elevated shell Revision: 2b7e18dec5ccb51270df7c8bd554ffdf2e28e603 win,msi: highlight installation of 3rd-party tools Revision: ebf36cd18018faab5427327c3469a71dd1d35129 win,msi: install tools for native modules PR-URL: https://github.com/nodejs/node/pull/24344 Refs: https://github.com/nodejs/node/pull/22645 Refs: https://github.com/nodejs/node/pull/23987 Refs: https://github.com/nodejs/Release/issues/369 Refs: https://github.com/nodejs/node/issues/23838 Refs: https://github.com/nodejs/security-wg/issues/439 Reviewed-By: João Reis Reviewed-By: Richard Lau --- tools/msvs/install_tools/install_tools.bat | 76 ---------------------- tools/msvs/install_tools/install_tools.txt | 3 - tools/msvs/msi/i18n/en-us.wxl | 8 --- tools/msvs/msi/product.wxs | 43 +----------- 4 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 tools/msvs/install_tools/install_tools.bat delete mode 100644 tools/msvs/install_tools/install_tools.txt diff --git a/tools/msvs/install_tools/install_tools.bat b/tools/msvs/install_tools/install_tools.bat deleted file mode 100644 index 36456fa6f656a9..00000000000000 --- a/tools/msvs/install_tools/install_tools.bat +++ /dev/null @@ -1,76 +0,0 @@ -@echo off - -setlocal - -cls -echo ==================================================== -echo Tools for Node.js Native Modules Installation Script -echo ==================================================== -echo. -echo This Boxstarter script will install Python and the Visual Studio Build Tools, -echo necessary to compile Node.js native modules. Note that Boxstarter, -echo Chocolatey and required Windows updates will also be installed. -echo. -echo This will require about 3 Gb of free disk space, plus any space necessary to -echo install Windows updates. -echo. -echo This will take a while to run. Your computer may reboot during the -echo installation, and will resume automatically. -echo. -echo Please close all open programs for the duration of the installation. -echo. -echo You can close this window to stop now. This script can be invoked from the -echo Start menu. Detailed instructions to install these tools manually are -echo available at https://github.com/nodejs/node-gyp#on-windows -echo. -pause - -cls -REM Adapted from https://github.com/Microsoft/windows-dev-box-setup-scripts/blob/79bbe5bdc4867088b3e074f9610932f8e4e192c2/README.md#legal -echo Using this script downloads third party software -echo ------------------------------------------------ -echo This script will direct to Chocolatey to install packages. By using -echo Chocolatey to install a package, you are accepting the license for the -echo application, executable(s), or other artifacts delivered to your machine as a -echo result of a Chocolatey install. This acceptance occurs whether you know the -echo license terms or not. Read and understand the license terms of the packages -echo being installed and their dependencies prior to installation: -echo - https://chocolatey.org/packages/chocolatey -echo - https://chocolatey.org/packages/boxstarter -echo - https://chocolatey.org/packages/python2 -echo - https://chocolatey.org/packages/visualstudio2017buildtools -echo - https://chocolatey.org/packages/visualstudio2017-workload-vctools -echo. -echo This script is provided AS-IS without any warranties of any kind -echo ---------------------------------------------------------------- -echo Chocolatey has implemented security safeguards in their process to help -echo protect the community from malicious or pirated software, but any use of this -echo script is at your own risk. Please read the Chocolatey's legal terms of use -echo and the Boxstarter project license as well as how the community repository -echo for Chocolatey.org is maintained. -echo. -pause - -cls -echo !!!!!WARNING!!!!! -echo ----------------- -echo Use of Boxstarter may reboot your computer automatically multiple times. -echo When performing a reboot, Boxstarter will need to disable User Account -echo Control (UAC) to allow the script to run immediately after the reboot. When -echo the scripts have completed, Boxstarter will re-enable UAC. If you prematurely -echo stop the process, UAC will need to be re-enabled manually. -echo. -echo Sometimes the scripts may install all necessary Windows Updates which -echo could cause a high number of reboots that appear to be a reboot loop when -echo in fact it is just a normal Windows Updates reboot cycle. -:acceptretry -echo. -echo Your computer may REBOOT SEVERAL TIMES WITHOUT FURTHER WARNING. -echo Please type YES followed by enter to confirm that you have saved all your -set /p "ACCEPT_PROMPT=work and closed all open programs: " -if /i not "%ACCEPT_PROMPT%"=="yes" ( - echo Please type YES to confirm, or close the window to exit. - goto acceptretry -) - -"%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://boxstarter.org/bootstrapper.ps1'')); get-boxstarter -Force; Install-BoxstarterPackage -PackageName ''%~dp0\install_tools.txt''; Read-Host ''Type ENTER to exit'' ' -Verb RunAs diff --git a/tools/msvs/install_tools/install_tools.txt b/tools/msvs/install_tools/install_tools.txt deleted file mode 100644 index baf530a774759b..00000000000000 --- a/tools/msvs/install_tools/install_tools.txt +++ /dev/null @@ -1,3 +0,0 @@ -choco upgrade -y python2 -choco upgrade -y visualstudio2017buildtools -choco upgrade -y visualstudio2017-workload-vctools diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index 9b948156a5481d..86da6ecc40ecaf 100644 --- a/tools/msvs/msi/i18n/en-us.wxl +++ b/tools/msvs/msi/i18n/en-us.wxl @@ -8,14 +8,6 @@ A later version of [ProductName] is already installed. Setup will now exit. - [ProductName] Setup - {\WixUI_Font_Title}Tools for Native Modules - Optionally install the tools necessary to compile native modules. - WixUI_Bmp_Banner - 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. - Automatically install the necessary tools. Note that this will also install Boxstarter and Chocolatey. The script will pop-up in a new window after the installation completes. - Alternatively, follow the instructions at https://github.com/nodejs/node-gyp#on-windows]]> to install the dependencies yourself. - Node.js runtime Install the core [ProductName] runtime (node.exe). diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index ad48fedafd9ea0..e9e4e33751d254 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -72,8 +72,6 @@ - - - - - - - - - - @@ -205,12 +195,6 @@ Arguments='/k "[INSTALLDIR]nodevars.bat"' Show="normal" WorkingDirectory="INSTALLDIR"/> - - - - @@ -359,23 +340,6 @@ - - - - - - - - - - - - - - - 1 - - NOT Installed Installed AND PATCH @@ -386,6 +350,7 @@ 1 1 1 + 1 NOT Installed OR WixUI_InstallMode = "Change" Installed AND NOT PATCH Installed AND PATCH @@ -396,11 +361,7 @@ 1 Installed NOT Installed - 1 - 1 - 1 - NATIVETOOLSCHECKBOX = 1 - 1 + 1