From bdf505bc5ab56851adc0a71ddc34b19032a4c528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Fri, 21 Sep 2018 20:37:02 +0200 Subject: [PATCH 1/2] win,msi: highlight installation of 3rd-party tools Currently, the installation wizard more or less silently installs third-party software (Boxstarter + Chocolatey). This adds some text to the MSI installation dialog and to the Boxstarter installation script. Refs: https://github.com/nodejs/node/pull/22645 Refs: https://github.com/nodejs/node/pull/22988 --- tools/msvs/install_tools/install_tools.bat | 4 ++-- tools/msvs/msi/i18n/en-us.wxl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/msvs/install_tools/install_tools.bat b/tools/msvs/install_tools/install_tools.bat index 6bef8ca5b64258..1cb3c9300d59f6 100644 --- a/tools/msvs/install_tools/install_tools.bat +++ b/tools/msvs/install_tools/install_tools.bat @@ -5,8 +5,8 @@ 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. All necessary Windows updates -echo will also be installed. +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. diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index e69ea7bbece830..8bee50dbe786b9 100644 --- a/tools/msvs/msi/i18n/en-us.wxl +++ b/tools/msvs/msi/i18n/en-us.wxl @@ -14,7 +14,7 @@ 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. 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. + Note that this will also install Boxstarter and Chocolatey. Alternatively, follow the instructions at https://github.com/nodejs/node-gyp#on-windows]]> to install the dependencies yourself. Node.js runtime From a45da799240667332d6f0ed92eefad5b9b185ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Mon, 24 Sep 2018 01:55:01 +0200 Subject: [PATCH 2/2] Address comment --- tools/msvs/msi/i18n/en-us.wxl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index 8bee50dbe786b9..ee2e232d79ca59 100644 --- a/tools/msvs/msi/i18n/en-us.wxl +++ b/tools/msvs/msi/i18n/en-us.wxl @@ -13,8 +13,8 @@ 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. The script will pop-up in a new window after the installation completes. - Note that this will also install Boxstarter and Chocolatey. Alternatively, follow the instructions at https://github.com/nodejs/node-gyp#on-windows]]> to install the dependencies yourself. + 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