diff options
| author | João Reis <reis@janeasystems.com> | 2018-11-27 02:18:11 +0000 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2018-12-05 20:54:06 +0000 |
| commit | 76afdffdf4aed0ce944867d32545505d25b77118 (patch) | |
| tree | 25b90620e8e46db1cdb81a3b67970637d5579963 /tools/msvs/msi | |
| parent | bb01597a7706c9378c280b628e64e68558969d8f (diff) | |
| download | android-node-v8-76afdffdf4aed0ce944867d32545505d25b77118.tar.gz android-node-v8-76afdffdf4aed0ce944867d32545505d25b77118.tar.bz2 android-node-v8-76afdffdf4aed0ce944867d32545505d25b77118.zip | |
win: do not use Boxstarter to install tools
Use Chocolatey directly in the tools installation script.
PR-URL: https://github.com/nodejs/node/pull/24677
Fixes: https://github.com/nodejs/node/issues/23838
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'tools/msvs/msi')
| -rw-r--r-- | tools/msvs/msi/i18n/en-us.wxl | 2 | ||||
| -rwxr-xr-x | tools/msvs/msi/product.wxs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index ee2e232d79..16d79173d6 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. 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="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> <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 --> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index b21e86fc7c..b4457e4365 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -73,7 +73,6 @@ <ComponentRef Id="NodeStartMenu"/> <ComponentRef Id="AppData" /> <ComponentRef Id="InstallToolsBat" /> - <ComponentRef Id="InstallToolsTxt" /> <ComponentGroupRef Id="Product.Generated"/> <Feature Id="NodeEtwSupport" @@ -161,10 +160,6 @@ <File Id="InstallToolsBat" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.bat"/> </Component> - <Component Id="InstallToolsTxt"> - <File Id="InstallToolsTxt" Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.txt"/> - </Component> - <?if $(var.NoETW) != 1 ?> <Component Id="NodeEtwSupport"> <File Id="node_etw_provider.man" Source="$(var.RepoDir)\src\res\node_etw_provider.man"> |