From 2b7e18dec5ccb51270df7c8bd554ffdf2e28e603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Fri, 21 Sep 2018 20:37:02 +0200
Subject: [PATCH] win,msi: highlight installation of 3rd-party tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.

PR-URL: https://github.com/nodejs/node/pull/23003
Refs: https://github.com/nodejs/node/pull/22645
Refs: https://github.com/nodejs/node/pull/22988
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: João Reis <reis@janeasystems.com>
---
 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 71c17014911033..9b948156a5481d 100644
--- a/tools/msvs/msi/i18n/en-us.wxl
+++ b/tools/msvs/msi/i18n/en-us.wxl
@@ -13,7 +13,7 @@
     <String Id="NativeToolsDlgDescription">Optionally install the tools necessary to compile native modules.</String>
     <String Id="NativeToolsDlgBannerBitmap">WixUI_Bmp_Banner</String>
     <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>
-    <String Id="NativeToolsDlgInstallCheckbox">Automatically install the necessary tools. The script will pop-up in a new window after the installation completes.</String>
+    <String Id="NativeToolsDlgInstallCheckbox">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.</String>
     <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>
 
     <!-- References like [ProductName] or $(var.ProductName) don't seem to work in Title attributes -->